lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [9/9] git commit: refs/heads/master - Regenerate charmonizer.c
Date Mon, 10 Mar 2014 20:40:13 GMT
Regenerate charmonizer.c

Add /MD flag on Windows.


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

Branch: refs/heads/master
Commit: bdb4ea51245f563a603ac53e4c1d39501ce89146
Parents: 3dc812a
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Mon Mar 10 21:26:13 2014 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Mon Mar 10 21:38:57 2014 +0100

----------------------------------------------------------------------
 clownfish/compiler/common/charmonizer.c | 18 +++++++++++-------
 clownfish/runtime/common/charmonizer.c  | 18 +++++++++++-------
 common/charmonizer.c                    | 18 +++++++++++-------
 3 files changed, 33 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/bdb4ea51/clownfish/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/common/charmonizer.c b/clownfish/compiler/common/charmonizer.c
index d716a7e..f1466ba 100644
--- a/clownfish/compiler/common/charmonizer.c
+++ b/clownfish/compiler/common/charmonizer.c
@@ -1836,16 +1836,20 @@ chaz_CFlags_set_warnings_as_errors(chaz_CFlags *flags) {
 void
 chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
     const char *string;
-    if (flags->style != CHAZ_CFLAGS_STYLE_GNU
-        || strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0
-       ) {
-        return;
+    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
+        string = "/MD";
     }
-    if (chaz_OS_is_darwin()) {
-        string = "-fno-common";
+    else if (flags->style != CHAZ_CFLAGS_STYLE_GNU) {
+        const char *shlib_ext = chaz_OS_shared_lib_ext();
+        if (strcmp(shlib_ext, ".dylib") == 0) {
+            string = "-fno-common";
+        }
+        else if (strcmp(shlib_ext, ".so") == 0) {
+            string = "-fPIC";
+        }
     }
     else {
-        string = "-fPIC";
+        return;
     }
     chaz_CFlags_append(flags, string);
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/bdb4ea51/clownfish/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/common/charmonizer.c b/clownfish/runtime/common/charmonizer.c
index 7cfc202..02634b5 100644
--- a/clownfish/runtime/common/charmonizer.c
+++ b/clownfish/runtime/common/charmonizer.c
@@ -1836,16 +1836,20 @@ chaz_CFlags_set_warnings_as_errors(chaz_CFlags *flags) {
 void
 chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
     const char *string;
-    if (flags->style != CHAZ_CFLAGS_STYLE_GNU
-        || strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0
-       ) {
-        return;
+    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
+        string = "/MD";
     }
-    if (chaz_OS_is_darwin()) {
-        string = "-fno-common";
+    else if (flags->style != CHAZ_CFLAGS_STYLE_GNU) {
+        const char *shlib_ext = chaz_OS_shared_lib_ext();
+        if (strcmp(shlib_ext, ".dylib") == 0) {
+            string = "-fno-common";
+        }
+        else if (strcmp(shlib_ext, ".so") == 0) {
+            string = "-fPIC";
+        }
     }
     else {
-        string = "-fPIC";
+        return;
     }
     chaz_CFlags_append(flags, string);
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/bdb4ea51/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index ceec4cf..31f0481 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -1836,16 +1836,20 @@ chaz_CFlags_set_warnings_as_errors(chaz_CFlags *flags) {
 void
 chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
     const char *string;
-    if (flags->style != CHAZ_CFLAGS_STYLE_GNU
-        || strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0
-       ) {
-        return;
+    if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) {
+        string = "/MD";
     }
-    if (chaz_OS_is_darwin()) {
-        string = "-fno-common";
+    else if (flags->style != CHAZ_CFLAGS_STYLE_GNU) {
+        const char *shlib_ext = chaz_OS_shared_lib_ext();
+        if (strcmp(shlib_ext, ".dylib") == 0) {
+            string = "-fno-common";
+        }
+        else if (strcmp(shlib_ext, ".so") == 0) {
+            string = "-fPIC";
+        }
     }
     else {
-        string = "-fPIC";
+        return;
     }
     chaz_CFlags_append(flags, string);
 }


Mime
View raw message