Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-26 11:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rene Liebscher:

Browse source 
* reverse library names from bcpp_library to library_bcpp
* move some code to the right places, to put the def-files
  in the right directories again
This commit is contained in:
Greg Ward 2000-09-01 01:28:33 +00:00
parent 7483d6803b
commit cec1568625
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/distutils/bcppcompiler.py
View file

@ -224,17 +224,6 @@ def link_shared_object (self,
else: else:
ld_args = self.ldflags_shared[:] ld_args = self.ldflags_shared[:]
# Borland C++ has problems with '/' in paths
objects = map(os.path.normpath, objects)
startup_obj = 'c0d32'
objects.insert(0, startup_obj)
# either exchange python15.lib in the python libs directory against
# a Borland-like one, or create one with name bcpp_python15.lib
# there and remove the pragmas from config.h
libraries.append ('import32')
libraries.append ('cw32mt')
# Create a temporary exports file for use by the linker # Create a temporary exports file for use by the linker
head, tail = os.path.split (output_filename) head, tail = os.path.split (output_filename)
modname, ext = os.path.splitext (tail) modname, ext = os.path.splitext (tail)
@ -246,6 +235,17 @@ def link_shared_object (self,
self.execute(write_file, (def_file, contents), self.execute(write_file, (def_file, contents),
"writing %s" % def_file) "writing %s" % def_file)
# Borland C++ has problems with '/' in paths
objects = map(os.path.normpath, objects)
startup_obj = 'c0d32'
objects.insert(0, startup_obj)
# either exchange python15.lib in the python libs directory against
# a Borland-like one, or create one with name bcpp_python15.lib
# there and remove the pragmas from config.h
libraries.append ('import32')
libraries.append ('cw32mt')
# Start building command line flags and options. # Start building command line flags and options.
for l in library_dirs: for l in library_dirs:
@ -377,9 +377,9 @@ def find_library_file (self, dirs, lib, debug=0):
# seems to have a different format for static libraries. # seems to have a different format for static libraries.
if debug: if debug:
dlib = (lib + "_d") dlib = (lib + "_d")
try_names = ("bcpp_" + dlib, "bcpp_" + lib, dlib, lib) try_names = (dlib + "_bcpp", lib + "_bcpp", dlib, lib)
else: else:
try_names = ("bcpp_" + lib, lib) try_names = (lib + "_bcpp", lib)
for dir in dirs: for dir in dirs:
for name in try_names: for name in try_names: