lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [2/3] git commit: refs/heads/master - Fix parallel build
Date Sat, 04 May 2013 23:10:09 GMT
Fix parallel build


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/00daa7de
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/00daa7de
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/00daa7de

Branch: refs/heads/master
Commit: 00daa7de10a1614feb785fb2dfdf3e984614852c
Parents: 43f565f
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Sun May 5 00:28:14 2013 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Sun May 5 00:28:14 2013 +0200

----------------------------------------------------------------------
 common/charmonizer.main |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/00daa7de/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/common/charmonizer.main b/common/charmonizer.main
index 7b320af..0460724 100644
--- a/common/charmonizer.main
+++ b/common/charmonizer.main
@@ -292,7 +292,11 @@ S_write_makefile(struct chaz_CLIArgs *args) {
                                    lemon_cflags);
     chaz_CFlags_destroy(lemon_cflags);
 
-    rule = chaz_MakeFile_add_rule(makefile, "$(CFC_EXE)", NULL);
+    /*
+     * CFC also builds LEMON_EXE, so it might be built twice at the same time
+     * in parallel builds. Adding LEMON_EXE as prereq of CFC_EXE avoids this.
+     */
+    rule = chaz_MakeFile_add_rule(makefile, "$(CFC_EXE)", "$(LEMON_EXE)");
     chaz_MakeRule_add_make_command(rule, "$(CFC_DIR)", NULL);
 
     rule = chaz_MakeFile_add_rule(makefile, "$(AUTOGEN_DIR)", "$(CFC_EXE)");


Mime
View raw message