[Python-checkins] CVS: distutils/distutils sysconfig.py,1.24,1.25

[Greg Ward]

Update of /cvsroot/python/distutils/distutils
In directory slayer.i.sourceforge.net:/tmp/cvs-serv12613

Modified Files:
	sysconfig.py 
Log Message:
Rene Liebscher: hack '_init_posix()' to handle the BeOS linker script.
(With a worry-wart comment added by me about where we *should* add the
Python library to the link.)


Index: sysconfig.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/sysconfig.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** sysconfig.py	2000/08/02 01:49:40	1.24
--- sysconfig.py	2000/09/01 01:23:26	1.25
***************
*** 256,259 ****
--- 256,276 ----
          g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
  
+     if sys.platform == 'beos':
+ 
+         # Linker script is in the config directory.  In the Makefile it is
+         # relative to the srcdir, which after installation no longer makes
+         # sense.
+         python_lib = get_python_lib(standard_lib=1)
+         linkerscript_name = os.path.basename(string.split(g['LDSHARED'])[0])
+         linkerscript = os.path.join(python_lib, 'config', linkerscript_name)
+ 
+         # XXX this isn't the right place to do this: adding the Python
+         # library to the link, if needed, should be in the "build_ext"
+         # command.  (It's also needed for non-MS compilers on Windows, and
+         # it's taken care of for them by the 'build_ext.get_libraries()'
+         # method.)
+         g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
+                          (linkerscript, sys.prefix, sys.version[0:3]))
+ 
  
  def _init_nt():