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 2014/11/17 18:33:28 UTC
[11/19] lucy-clownfish git commit: Cease generating Clownfish static
lib with C host.
Cease generating Clownfish static lib with C host.
We only need the static archive for other hosts, which will use it to
create their own libraries.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/f5c9665e
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/f5c9665e
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/f5c9665e
Branch: refs/heads/go_bindings_1
Commit: f5c9665ef2cfb96875cc1dc1829f36fac990ad9c
Parents: 29c8e8f
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Wed Nov 5 10:28:12 2014 -0800
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Fri Nov 14 16:45:37 2014 -0800
----------------------------------------------------------------------
runtime/common/charmonizer.main | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f5c9665e/runtime/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.main b/runtime/common/charmonizer.main
index 2e68977..233e1d5 100644
--- a/runtime/common/charmonizer.main
+++ b/runtime/common/charmonizer.main
@@ -280,10 +280,7 @@ S_write_makefile(struct chaz_CLI *cli) {
exe_ext, NULL);
chaz_Lib *shared_lib = chaz_Lib_new("cfish", chaz_Lib_SHARED,
cfish_version, cfish_major_version);
- chaz_Lib *static_lib = chaz_Lib_new("cfish", chaz_Lib_STATIC, cfish_version,
- cfish_major_version);
char *shared_lib_filename = chaz_Lib_filename(shared_lib);
- char *static_lib_filename = chaz_Lib_filename(static_lib);
const char *math_library = chaz_Floats_math_library();
char *test_command;
@@ -292,11 +289,7 @@ S_write_makefile(struct chaz_CLI *cli) {
chaz_CFlags *link_flags;
chaz_CFlags *test_cflags;
- scratch = chaz_Util_join(" ", shared_lib_filename, static_lib_filename,
- NULL);
- chaz_MakeFile_add_rule(makefile, "all", scratch);
- chaz_MakeFile_add_rule(makefile, "static", static_lib_filename);
- free(scratch);
+ chaz_MakeFile_add_rule(makefile, "all", shared_lib_filename);
rule = chaz_MakeFile_add_rule(makefile, cfc_exe, NULL);
chaz_MakeRule_add_make_command(rule, cfc_dir, NULL);
@@ -321,7 +314,6 @@ S_write_makefile(struct chaz_CLI *cli) {
chaz_MakeFile_add_shared_lib(makefile, shared_lib, "$(CLOWNFISH_OBJS)",
link_flags);
chaz_CFlags_destroy(link_flags);
- chaz_MakeFile_add_static_lib(makefile, static_lib, "$(CLOWNFISH_OBJS)");
test_cflags = chaz_CC_new_cflags();
chaz_CFlags_enable_optimization(test_cflags);
@@ -349,9 +341,7 @@ S_write_makefile(struct chaz_CLI *cli) {
}
chaz_Lib_destroy(shared_lib);
- chaz_Lib_destroy(static_lib);
free(shared_lib_filename);
- free(static_lib_filename);
free(test_command);
free(cfc_exe);
free(test_cfish_exe);