[Python-checkins] CVS: python/dist/src/Lib/distutils sysconfig.py,1.32,1.33

[Neil Schemenauer]

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory usw-pr-cvs1:/tmp/cvs-serv403/Lib/distutils

Modified Files:
	sysconfig.py 
Log Message:
Linking just got simpiler on AIX and BeOS (closes SF patch #103679).


Index: sysconfig.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** sysconfig.py	2001/01/24 17:17:20	1.32
--- sysconfig.py	2001/02/16 03:31:13	1.33
***************
*** 306,334 ****
      # -- these paths are relative to the Python source, but when installed
      # the scripts are in another directory.
!     if sys.platform == 'aix4':          # what about AIX 3.x ?
!         # Linker script is in the config directory, not in Modules as the
!         # Makefile says.
!         python_lib = get_python_lib(standard_lib=1)
!         ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
!         python_exp = os.path.join(python_lib, 'config', 'python.exp')
! 
!         g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
! 
!     elif 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, PREFIX, sys.version[0:3]))
  
      global _config_vars
--- 306,311 ----
      # -- these paths are relative to the Python source, but when installed
      # the scripts are in another directory.
!     if python_build:
! 	g['LDSHARED'] = g['BLDSHARED']
  
      global _config_vars