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 2012/12/13 03:27:50 UTC
[lucy-commits] [4/12] git commit: refs/heads/chaz_compiler_flags - Add some
EXTRA_CFLAGS using charmonizer.
Add some EXTRA_CFLAGS using charmonizer.
Process debugging and valgrind-facilitating environment variables using
charmonizer. Add a command-line argument to charmonizer to disable
threads.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/25c5b573
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/25c5b573
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/25c5b573
Branch: refs/heads/chaz_compiler_flags
Commit: 25c5b573788746f303872caf525da38b4ae59861
Parents: 224a5c4
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Wed Dec 12 13:38:58 2012 -0800
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Wed Dec 12 17:02:00 2012 -0800
----------------------------------------------------------------------
clownfish/runtime/common/charmonizer.main | 25 +++++++++++++++++++++++
common/charmonizer.main | 26 ++++++++++++++++++++++++
2 files changed, 51 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/25c5b573/clownfish/runtime/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/clownfish/runtime/common/charmonizer.main b/clownfish/runtime/common/charmonizer.main
index b65dc01..4ffef3b 100644
--- a/clownfish/runtime/common/charmonizer.main
+++ b/clownfish/runtime/common/charmonizer.main
@@ -39,6 +39,21 @@
#include "Charmonizer/Core/ConfWriterPerl.h"
#include "Charmonizer/Core/ConfWriterRuby.h"
+static void
+S_add_compiler_flags(struct chaz_CLIArgs *args) {
+ if (chaz_Probe_gcc_version_num()) {
+ if (getenv("LUCY_VALGRIND")) {
+ chaz_CC_add_extra_cflags("-DLUCY_VALGRIND -fno-inline-functions");
+ }
+ else if (getenv("LUCY_DEBUG")) {
+ chaz_CC_add_extra_cflags(
+ "-DLUCY_DEBUG -pedantic -Wall -Wextra "
+ "-Wno-variadic-macros "
+ );
+ }
+ }
+}
+
int main(int argc, const char **argv) {
/* Initialize. */
{
@@ -48,6 +63,16 @@ int main(int argc, const char **argv) {
chaz_Probe_die_usage();
}
chaz_Probe_init(&args);
+ S_add_compiler_flags(&args);
+ }
+ {
+ int i;
+ for (i = 0; i < argc; i++) {
+ if (strncmp(argv[i], "--disable-threads", 17) == 0) {
+ chaz_CC_add_extra_cflags("-DLUCY_NOTHREADS");
+ break;
+ }
+ }
}
/* Run probe modules. */
http://git-wip-us.apache.org/repos/asf/lucy/blob/25c5b573/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/common/charmonizer.main b/common/charmonizer.main
index 7090033..0a54b88 100644
--- a/common/charmonizer.main
+++ b/common/charmonizer.main
@@ -38,6 +38,21 @@
#include "Charmonizer/Core/ConfWriterPerl.h"
#include "Charmonizer/Core/ConfWriterRuby.h"
+static void
+S_add_compiler_flags(struct chaz_CLIArgs *args) {
+ if (chaz_Probe_gcc_version_num()) {
+ if (getenv("LUCY_VALGRIND")) {
+ chaz_CC_add_extra_cflags("-DLUCY_VALGRIND -fno-inline-functions");
+ }
+ else if (getenv("LUCY_DEBUG")) {
+ chaz_CC_add_extra_cflags(
+ "-DLUCY_DEBUG -pedantic -Wall -Wextra "
+ "-Wno-variadic-macros "
+ );
+ }
+ }
+}
+
int main(int argc, const char **argv) {
/* Initialize. */
{
@@ -47,6 +62,17 @@ int main(int argc, const char **argv) {
chaz_Probe_die_usage();
}
chaz_Probe_init(&args);
+ S_add_compiler_flags(&args);
+
+ }
+ {
+ int i;
+ for (i = 0; i < argc; i++) {
+ if (strncmp(argv[i], "--disable-threads", 17) == 0) {
+ chaz_CC_add_extra_cflags("-DLUCY_NOTHREADS");
+ break;
+ }
+ }
}
/* Run probe modules. */