Repository: lucy Updated Branches: refs/heads/master dd760b343 -> 90c7b4711
Compile lemon without extra compiler flags Avoids compilation problems on Windows. Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/e0833028 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/e0833028 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/e0833028 Branch: refs/heads/master Commit: e0833028bb5ac545ca5ea5f087521ff5cf70788f Parents: dd760b3 Author: Nick Wellnhofer <[email protected]> Authored: Fri Jul 15 21:52:28 2016 +0200 Committer: Nick Wellnhofer <[email protected]> Committed: Fri Jul 15 21:52:28 2016 +0200 ---------------------------------------------------------------------- common/charmonizer.c | 23 +++++++++++++---------- common/charmonizer.main | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/e0833028/common/charmonizer.c ---------------------------------------------------------------------- diff --git a/common/charmonizer.c b/common/charmonizer.c index b916fd3..85f8afd 100644 --- a/common/charmonizer.c +++ b/common/charmonizer.c @@ -5080,13 +5080,6 @@ chaz_MakeBinary* chaz_MakeFile_add_lemon_exe(chaz_MakeFile *self, const char *dir) { chaz_MakeBinary *exe = chaz_MakeFile_add_exe(self, dir, "lemon"); chaz_MakeBinary_add_src_file(exe, dir, "lemon.c"); - - if (chaz_CC_gcc_version_num()) { - chaz_CFlags *cflags = chaz_MakeBinary_get_compile_flags(exe); - chaz_CFlags_append(cflags, "-Wno-pedantic -Wno-sign-compare" - " -Wno-unused-parameter"); - } - return exe; } @@ -8957,7 +8950,7 @@ lucy_MakeFile_write(lucy_MakeFile *self) { chaz_CFlags_add_include_dir(makefile_cflags, self->ucd_dir); chaz_CFlags_add_include_dir(makefile_cflags, self->utf8proc_dir); - var = chaz_MakeFile_add_var(self->makefile, "CFLAGS", NULL); + var = chaz_MakeFile_add_var(self->makefile, "LUCY_CFLAGS", NULL); chaz_MakeVar_append(var, chaz_CFlags_get_string(extra_cflags)); chaz_MakeVar_append(var, chaz_CFlags_get_string(makefile_cflags)); chaz_MakeVar_append(var, chaz_CC_get_cflags()); @@ -8977,6 +8970,7 @@ lucy_MakeFile_write(lucy_MakeFile *self) { lib_objs = "$(LUCY_SHARED_LIB_OBJS)"; compile_flags = chaz_MakeBinary_get_compile_flags(self->lib); + chaz_CFlags_append(compile_flags, "$(LUCY_CFLAGS)"); chaz_CFlags_add_define(compile_flags, "CFP_LUCY", NULL); link_flags = chaz_MakeBinary_get_link_flags(self->lib); @@ -9005,11 +8999,13 @@ lucy_MakeFile_write(lucy_MakeFile *self) { = chaz_MakeFile_add_static_lib(self->makefile, NULL, "lucy"); lib_objs = "$(LUCY_STATIC_LIB_OBJS)"; + compile_flags = chaz_MakeBinary_get_compile_flags(self->lib); + chaz_CFlags_append(compile_flags, "$(LUCY_CFLAGS)"); + if (strcmp(host, "python") == 0) { /* For Python, the static library is linked into a shared * library. */ - compile_flags = chaz_MakeBinary_get_compile_flags(self->lib); chaz_CFlags_compile_shared_library(compile_flags); chaz_CFlags_add_define(compile_flags, "CFP_CFISH", NULL); } @@ -9038,6 +9034,7 @@ lucy_MakeFile_write(lucy_MakeFile *self) { test_lib_objs = "$(TESTLUCY_SHARED_LIB_OBJS)"; compile_flags = chaz_MakeBinary_get_compile_flags(self->test_lib); + chaz_CFlags_append(compile_flags, "$(LUCY_CFLAGS)"); chaz_CFlags_add_define(compile_flags, "CFP_TESTLUCY", NULL); link_flags = chaz_MakeBinary_get_link_flags(self->test_lib); @@ -9064,11 +9061,13 @@ lucy_MakeFile_write(lucy_MakeFile *self) { = chaz_MakeFile_add_static_lib(self->makefile, NULL, "testlucy"); test_lib_objs = "$(TESTLUCY_STATIC_LIB_OBJS)"; + compile_flags = chaz_MakeBinary_get_compile_flags(self->test_lib); + chaz_CFlags_append(compile_flags, "$(LUCY_CFLAGS)"); + if (strcmp(host, "python") == 0) { /* For Python, the static library is linked into a shared * library. */ - compile_flags = chaz_MakeBinary_get_compile_flags(self->test_lib); chaz_CFlags_compile_shared_library(compile_flags); chaz_CFlags_add_define(compile_flags, "CFP_TESTLUCY", NULL); } @@ -9183,12 +9182,16 @@ lucy_MakeFile_write_c_cfc_rules(lucy_MakeFile *self) { static void lucy_MakeFile_write_c_test_rules(lucy_MakeFile *self) { chaz_MakeBinary *exe; + chaz_CFlags *compile_flags; chaz_CFlags *link_flags; chaz_MakeRule *rule; exe = chaz_MakeFile_add_exe(self->makefile, "t", "test_lucy"); chaz_MakeBinary_add_src_file(exe, "t", "test_lucy.c"); + compile_flags = chaz_MakeBinary_get_compile_flags(exe); + chaz_CFlags_append(compile_flags, "$(LUCY_CFLAGS)"); + link_flags = chaz_MakeBinary_get_link_flags(exe); if (self->cfish_lib_dir) { chaz_CFlags_add_library_path(link_flags, self->cfish_lib_dir); http://git-wip-us.apache.org/repos/asf/lucy/blob/e0833028/common/charmonizer.main ---------------------------------------------------------------------- diff --git a/common/charmonizer.main b/common/charmonizer.main index dfd0c78..b9c841b 100644 --- a/common/charmonizer.main +++ b/common/charmonizer.main @@ -371,7 +371,7 @@ lucy_MakeFile_write(lucy_MakeFile *self) { chaz_CFlags_add_include_dir(makefile_cflags, self->ucd_dir); chaz_CFlags_add_include_dir(makefile_cflags, self->utf8proc_dir); - var = chaz_MakeFile_add_var(self->makefile, "CFLAGS", NULL); + var = chaz_MakeFile_add_var(self->makefile, "LUCY_CFLAGS", NULL); chaz_MakeVar_append(var, chaz_CFlags_get_string(extra_cflags)); chaz_MakeVar_append(var, chaz_CFlags_get_string(makefile_cflags)); chaz_MakeVar_append(var, chaz_CC_get_cflags()); @@ -391,6 +391,7 @@ lucy_MakeFile_write(lucy_MakeFile *self) { lib_objs = "$(LUCY_SHARED_LIB_OBJS)"; compile_flags = chaz_MakeBinary_get_compile_flags(self->lib); + chaz_CFlags_append(compile_flags, "$(LUCY_CFLAGS)"); chaz_CFlags_add_define(compile_flags, "CFP_LUCY", NULL); link_flags = chaz_MakeBinary_get_link_flags(self->lib); @@ -419,11 +420,13 @@ lucy_MakeFile_write(lucy_MakeFile *self) { = chaz_MakeFile_add_static_lib(self->makefile, NULL, "lucy"); lib_objs = "$(LUCY_STATIC_LIB_OBJS)"; + compile_flags = chaz_MakeBinary_get_compile_flags(self->lib); + chaz_CFlags_append(compile_flags, "$(LUCY_CFLAGS)"); + if (strcmp(host, "python") == 0) { /* For Python, the static library is linked into a shared * library. */ - compile_flags = chaz_MakeBinary_get_compile_flags(self->lib); chaz_CFlags_compile_shared_library(compile_flags); chaz_CFlags_add_define(compile_flags, "CFP_CFISH", NULL); } @@ -452,6 +455,7 @@ lucy_MakeFile_write(lucy_MakeFile *self) { test_lib_objs = "$(TESTLUCY_SHARED_LIB_OBJS)"; compile_flags = chaz_MakeBinary_get_compile_flags(self->test_lib); + chaz_CFlags_append(compile_flags, "$(LUCY_CFLAGS)"); chaz_CFlags_add_define(compile_flags, "CFP_TESTLUCY", NULL); link_flags = chaz_MakeBinary_get_link_flags(self->test_lib); @@ -478,11 +482,13 @@ lucy_MakeFile_write(lucy_MakeFile *self) { = chaz_MakeFile_add_static_lib(self->makefile, NULL, "testlucy"); test_lib_objs = "$(TESTLUCY_STATIC_LIB_OBJS)"; + compile_flags = chaz_MakeBinary_get_compile_flags(self->test_lib); + chaz_CFlags_append(compile_flags, "$(LUCY_CFLAGS)"); + if (strcmp(host, "python") == 0) { /* For Python, the static library is linked into a shared * library. */ - compile_flags = chaz_MakeBinary_get_compile_flags(self->test_lib); chaz_CFlags_compile_shared_library(compile_flags); chaz_CFlags_add_define(compile_flags, "CFP_TESTLUCY", NULL); } @@ -597,12 +603,16 @@ lucy_MakeFile_write_c_cfc_rules(lucy_MakeFile *self) { static void lucy_MakeFile_write_c_test_rules(lucy_MakeFile *self) { chaz_MakeBinary *exe; + chaz_CFlags *compile_flags; chaz_CFlags *link_flags; chaz_MakeRule *rule; exe = chaz_MakeFile_add_exe(self->makefile, "t", "test_lucy"); chaz_MakeBinary_add_src_file(exe, "t", "test_lucy.c"); + compile_flags = chaz_MakeBinary_get_compile_flags(exe); + chaz_CFlags_append(compile_flags, "$(LUCY_CFLAGS)"); + link_flags = chaz_MakeBinary_get_link_flags(exe); if (self->cfish_lib_dir) { chaz_CFlags_add_library_path(link_flags, self->cfish_lib_dir);
