Author: David Schneider <[email protected]>
Branch:
Changeset: r44135:5b0e029514d4
Date: 2011-05-13 15:16 +0200
http://bitbucket.org/pypy/pypy/changeset/5b0e029514d4/
Log: remove force-make command line option and always use the generated
make file
diff --git a/pypy/config/translationoption.py b/pypy/config/translationoption.py
--- a/pypy/config/translationoption.py
+++ b/pypy/config/translationoption.py
@@ -163,9 +163,6 @@
cmdline="--cflags"),
StrOption("linkerflags", "Specify flags for the linker (C backend only)",
cmdline="--ldflags"),
- BoolOption("force_make", "Force execution of makefile instead of"
- " calling platform", cmdline="--force-make",
- default=False, negation=False),
IntOption("make_jobs", "Specify -j argument to make for compilation"
" (C backend only)",
cmdline="--make-jobs", default=detect_number_of_processors()),
diff --git a/pypy/translator/c/genc.py b/pypy/translator/c/genc.py
--- a/pypy/translator/c/genc.py
+++ b/pypy/translator/c/genc.py
@@ -508,27 +508,15 @@
shared = self.config.translation.shared
- if (self.config.translation.gcrootfinder == "asmgcc" or
- self.config.translation.force_make):
- extra_opts = []
- if self.config.translation.make_jobs != 1:
- extra_opts += ['-j', str(self.config.translation.make_jobs)]
- self.translator.platform.execute_makefile(self.targetdir,
- extra_opts)
- if shared:
- self.shared_library_name = self.executable_name.new(
- purebasename='lib' + self.executable_name.purebasename,
- ext=self.translator.platform.so_ext)
- else:
- compiler = CCompilerDriver(self.translator.platform,
- [self.c_source_filename] +
self.extrafiles,
- self.eci, profbased=self.getprofbased(),
- outputfilename=exe_name)
- self.executable_name = compiler.build(shared=shared)
- if shared:
- self.executable_name = self.build_main_for_shared(
- self.executable_name, "pypy_main_startup", exe_name)
- assert self.executable_name
+ extra_opts = []
+ if self.config.translation.make_jobs != 1:
+ extra_opts += ['-j', str(self.config.translation.make_jobs)]
+ self.translator.platform.execute_makefile(self.targetdir,
+ extra_opts)
+ if shared:
+ self.shared_library_name = self.executable_name.new(
+ purebasename='lib' + self.executable_name.purebasename,
+ ext=self.translator.platform.so_ext)
self._compiled = True
return self.executable_name
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
