aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsimon <[email protected]>2015-03-18 10:32:29 +0000
committerlloyd <[email protected]>2015-03-18 10:32:29 +0000
commit1543f11ec85934f3bb001dbd60c2d16917a5e7c1 (patch)
treeff7f85ba0c4ab641ed328d47ba699ddcc051038b
parent78bad0493ab3848a0cc076205cc6d8a9c52fd213 (diff)
Fix the makefile for JOM
JOM is a nmake-compatible tool for Windows which supports -jN for parallel builds. JOM's $? variable is broken, but this workaround is simple. Github pull 66 from Simon Warta.
-rwxr-xr-xconfigure.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.py b/configure.py
index e6838c788..107511de1 100755
--- a/configure.py
+++ b/configure.py
@@ -1129,13 +1129,14 @@ def gen_makefile_lists(var, build_config, options, modules, cc, arch, osinfo):
"""
def build_commands(sources, obj_dir, flags):
for (obj_file,src) in zip(objectfile_list(sources, obj_dir), sources):
- yield '%s: %s\n\t$(CXX)%s $(%s_FLAGS) %s%s %s$? %s$@\n' % (
+ yield '%s: %s\n\t$(CXX)%s $(%s_FLAGS) %s%s %s%s %s$@\n' % (
obj_file, src,
isa_specific_flags(cc, src),
flags,
cc.add_include_dir_option,
build_config.include_dir,
cc.compile_option,
+ src,
cc.output_to_option)