From: Andrew MacIntyre <andymac@bullseye.apana.org.au>
Date: Sun, 4 Aug 2002 06:21:25 +0000 (+0000)
Subject: - comment improvement
X-Git-Tag: v2.3c1~4738
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4104db39b8c8a85b884bbba051d21b7ea1d21ee1;p=python

- comment improvement
- implement viable library search routine for EMX
---

diff --git a/Lib/distutils/emxccompiler.py b/Lib/distutils/emxccompiler.py
index 91920eb366..9cd9600c0e 100644
--- a/Lib/distutils/emxccompiler.py
+++ b/Lib/distutils/emxccompiler.py
@@ -177,7 +177,8 @@ class EMXCCompiler (UnixCCompiler):
 
     # -- Miscellaneous methods -----------------------------------------
 
-    # overwrite the one from CCompiler to support rc and res-files
+    # override the object_filenames method from CCompiler to
+    # support rc and res-files
     def object_filenames (self,
                           source_filenames,
                           strip_dir=0,
@@ -204,6 +205,29 @@ class EMXCCompiler (UnixCCompiler):
 
     # object_filenames ()
 
+    # override the find_library_file method from UnixCCompiler
+    # to deal with file naming/searching differences
+    def find_library_file(self, dirs, lib, debug=0):
+        shortlib = '%s.lib' % lib
+        longlib = 'lib%s.lib' % lib    # this form very rare
+
+        # get EMX's default library directory search path
+        try:
+            emx_dirs = os.environ['LIBRARY_PATH'].split(';')
+        except KeyError:
+            emx_dirs = []
+	
+        for dir in dirs + emx_dirs:
+            shortlibp = os.path.join(dir, shortlib)
+            longlibp = os.path.join(dir, longlib)
+            if os.path.exists(shortlibp):
+                return shortlibp
+            elif os.path.exists(longlibp):
+                return longlibp
+            
+        # Oops, didn't find it in *any* of 'dirs'
+        return None
+
 # class EMXCCompiler