lucy-commits mailing list archives

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


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

Branch: refs/heads/master
Commit: 16051063aabf9cd8bc934e9d0ca43644d3c4a28f
Parents: 00daa7d
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Sun May 5 00:28:45 2013 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Sun May 5 00:28:45 2013 +0200

----------------------------------------------------------------------
 common/charmonizer.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/16051063/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 76ff931..0e512c3 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -6449,7 +6449,7 @@ S_source_file_callback(char *file, void *context) {
     file[file_len-2] = '\0';
 
     pattern = "%s" DIR_SEP "%s$(OBJ_EXT)";
-    obj_file_size = strlen(pattern) + file_len + 10;
+    obj_file_size = strlen(pattern) + strlen(sfc->dir) + file_len + 10;
     obj_file = (char*)malloc(obj_file_size);
     sprintf(obj_file, pattern, sfc->dir, file);
     chaz_MakeVar_append(sfc->var, obj_file);
@@ -6616,7 +6616,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