You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2015/03/19 01:09:29 UTC

[09/19] lucy-clownfish git commit: Only build cfc and test_cfc exe's under C.

Only build cfc and test_cfc exe's under C.

As a side effect, don't add them to the 'clean' target.  This solves a
problem because `rm -f cfc` failes under the Go bindings errors out when
`cfc` is a directory.


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

Branch: refs/heads/master
Commit: 827a528d3ec28d52e3edcadce60ddf08bfb5d06b
Parents: 3d5934c
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Sun Mar 15 17:59:00 2015 -0700
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Sun Mar 15 18:05:43 2015 -0700

----------------------------------------------------------------------
 compiler/common/charmonizer.main | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/827a528d/compiler/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.main b/compiler/common/charmonizer.main
index 801c954..52f52ef 100644
--- a/compiler/common/charmonizer.main
+++ b/compiler/common/charmonizer.main
@@ -253,11 +253,13 @@ S_write_makefile(struct chaz_CLI *cli) {
     if (chaz_CLI_defined(cli, "enable-coverage")) {
         chaz_CFlags_enable_code_coverage(link_flags);
     }
-    chaz_MakeFile_add_exe(makefile, cfc_exe, "$(COMMON_OBJS) $(CFC_OBJS)",
-                          link_flags);
-    chaz_MakeFile_add_exe(makefile, test_cfc_exe,
-                          "$(COMMON_OBJS) $(COMMON_TEST_OBJS) $(TEST_CFC_OBJS)",
-                          link_flags);
+    if (strcmp(chaz_CLI_strval(cli, "host"), "c") == 0) {
+        chaz_MakeFile_add_exe(makefile, cfc_exe, "$(COMMON_OBJS) $(CFC_OBJS)",
+                              link_flags);
+        chaz_MakeFile_add_exe(makefile, test_cfc_exe,
+                              "$(COMMON_OBJS) $(COMMON_TEST_OBJS) $(TEST_CFC_OBJS)",
+                              link_flags);
+    }
     chaz_CFlags_destroy(link_flags);
 
     rule = chaz_MakeFile_add_rule(makefile, "test", test_cfc_exe);