You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2013/12/14 14:48:49 UTC
[lucy-commits] [6/6] git commit: refs/heads/master - Regenerate charmonizer.c
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/d804f387
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/d804f387
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/d804f387
Branch: refs/heads/master
Commit: d804f38715fca1f164baf5df94985e2fdaf5a8fb
Parents: ddbd929
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Dec 14 14:39:00 2013 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Dec 14 14:47:41 2013 +0100
----------------------------------------------------------------------
clownfish/compiler/common/charmonizer.c | 7 +++++++
clownfish/runtime/common/charmonizer.c | 10 +++++++++-
common/charmonizer.c | 9 +++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/d804f387/clownfish/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/common/charmonizer.c b/clownfish/compiler/common/charmonizer.c
index a1c2a19..5f1d319 100644
--- a/clownfish/compiler/common/charmonizer.c
+++ b/clownfish/compiler/common/charmonizer.c
@@ -1778,6 +1778,13 @@ chaz_CFlags_enable_optimization(chaz_CFlags *flags) {
}
void
+chaz_CFlags_enable_debugging(chaz_CFlags *flags) {
+ if (flags->style == CHAZ_CFLAGS_STYLE_GNU) {
+ chaz_CFlags_append(flags, "-g");
+ }
+}
+
+void
chaz_CFlags_disable_strict_aliasing(chaz_CFlags *flags) {
if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
return;
http://git-wip-us.apache.org/repos/asf/lucy/blob/d804f387/clownfish/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/common/charmonizer.c b/clownfish/runtime/common/charmonizer.c
index 3ab6f63..c104da2 100644
--- a/clownfish/runtime/common/charmonizer.c
+++ b/clownfish/runtime/common/charmonizer.c
@@ -1778,6 +1778,13 @@ chaz_CFlags_enable_optimization(chaz_CFlags *flags) {
}
void
+chaz_CFlags_enable_debugging(chaz_CFlags *flags) {
+ if (flags->style == CHAZ_CFLAGS_STYLE_GNU) {
+ chaz_CFlags_append(flags, "-g");
+ }
+}
+
+void
chaz_CFlags_disable_strict_aliasing(chaz_CFlags *flags) {
if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
return;
@@ -6938,6 +6945,7 @@ S_write_makefile(struct chaz_CLIArgs *args) {
makefile_cflags = chaz_CC_new_cflags();
chaz_CFlags_enable_optimization(makefile_cflags);
+ chaz_CFlags_enable_debugging(makefile_cflags);
chaz_CFlags_disable_strict_aliasing(makefile_cflags);
chaz_CFlags_compile_shared_library(makefile_cflags);
chaz_CFlags_hide_symbols(makefile_cflags);
@@ -6946,7 +6954,6 @@ S_write_makefile(struct chaz_CLIArgs *args) {
}
chaz_CFlags_add_include_dir(makefile_cflags, ".");
- chaz_CFlags_add_include_dir(makefile_cflags, core_dir);
chaz_CFlags_add_include_dir(makefile_cflags, autogen_inc_dir);
var = chaz_MakeFile_add_var(makefile, "CFLAGS", NULL);
@@ -7012,6 +7019,7 @@ S_write_makefile(struct chaz_CLIArgs *args) {
chaz_MakeFile_add_rule(makefile, "$(CLOWNFISH_OBJS)", "autogen");
link_flags = chaz_CC_new_cflags();
+ chaz_CFlags_enable_debugging(link_flags);
if (math_library) {
chaz_CFlags_add_external_library(link_flags, math_library);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/d804f387/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 0fc1466..ccd166e 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -1778,6 +1778,13 @@ chaz_CFlags_enable_optimization(chaz_CFlags *flags) {
}
void
+chaz_CFlags_enable_debugging(chaz_CFlags *flags) {
+ if (flags->style == CHAZ_CFLAGS_STYLE_GNU) {
+ chaz_CFlags_append(flags, "-g");
+ }
+}
+
+void
chaz_CFlags_disable_strict_aliasing(chaz_CFlags *flags) {
if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
return;
@@ -6963,6 +6970,7 @@ S_write_makefile(struct chaz_CLIArgs *args) {
makefile_cflags = chaz_CC_new_cflags();
chaz_CFlags_enable_optimization(makefile_cflags);
+ chaz_CFlags_enable_debugging(makefile_cflags);
chaz_CFlags_disable_strict_aliasing(makefile_cflags);
chaz_CFlags_compile_shared_library(makefile_cflags);
chaz_CFlags_hide_symbols(makefile_cflags);
@@ -7076,6 +7084,7 @@ S_write_makefile(struct chaz_CLIArgs *args) {
free(scratch);
link_flags = chaz_CC_new_cflags();
+ chaz_CFlags_enable_debugging(link_flags);
chaz_CFlags_add_library_path(link_flags, cfr_dir);
if (math_lib) {
chaz_CFlags_add_external_library(link_flags, math_lib);