diff options
| -rwxr-xr-x | Tools/freeze/freeze.py | 15 | ||||
| -rw-r--r-- | Tools/freeze/makefreeze.py | 10 |
2 files changed, 14 insertions, 11 deletions
diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py index 7018aca..4a555dd 100755 --- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -109,10 +109,9 @@ def main(): incldir = os.path.join(prefix, 'include/python%s' % version) config_c_in = os.path.join(binlib, 'config.c.in') frozenmain_c = os.path.join(binlib, 'frozenmain.c') - getpath_c = os.path.join(binlib, 'getpath.c') - supp_sources = [frozenmain_c, getpath_c] + supp_sources = [] makefile_in = os.path.join(binlib, 'Makefile') - defines = ['-DPYTHONPATH=\\"$(PYTHONPATH)\\"'] + defines = [] includes = ['-I' + incldir, '-I' + binlib] # sanity check of directories and files @@ -243,11 +242,7 @@ def main(): os.rename(backup, config_c) cflags = defines + includes + ['$(OPT)'] - libs = [] - for n in 'Modules', 'Python', 'Objects', 'Parser': - n = 'lib%s.a' % n - n = os.path.join(binlib, n) - libs.append(n) + libs = [os.path.join(binlib, 'libpython$(VERSION).a')] makevars = parsesetup.getmakevars(makefile_in) somevars = {} @@ -280,10 +275,10 @@ def main(): # Done! if odir: - print 'Now run make in', odir, + print 'Now run "make" in', odir, print 'to build the target:', base_target else: - print 'Now run make to build the target:', base_target + print 'Now run "make" to build the target:', base_target # Print usage message and exit diff --git a/Tools/freeze/makefreeze.py b/Tools/freeze/makefreeze.py index f660664..5c6f371 100644 --- a/Tools/freeze/makefreeze.py +++ b/Tools/freeze/makefreeze.py @@ -12,7 +12,15 @@ trailer = """\ {0, 0, 0} /* sentinel */ }; -struct _frozen *PyImport_FrozenModules = _PyImport_FrozenModules; +int +main(argc, argv) + int argc; + char **argv; +{ + PyImport_FrozenModules = _PyImport_FrozenModules; + return Py_FrozenMain(argc, argv); +} + """ def makefreeze(outfp, dict): |