lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject lucy-clownfish git commit: Compile as C under MSVC12
Date Fri, 23 Jan 2015 21:09:44 GMT
Repository: lucy-clownfish
Updated Branches:
  refs/heads/master aa82267a9 -> e58046c1c


Compile as C under MSVC12

MSVC12 should have the C99 features we need. Untested.


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

Branch: refs/heads/master
Commit: e58046c1c2a853861c4e04b404524aa079796eb8
Parents: aa82267
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Fri Jan 23 22:07:44 2015 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Fri Jan 23 22:07:44 2015 +0100

----------------------------------------------------------------------
 compiler/common/charmonizer.c    | 6 ++++--
 compiler/common/charmonizer.main | 6 ++++--
 runtime/common/charmonizer.c     | 6 ++++--
 runtime/common/charmonizer.main  | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/e58046c1/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.c b/compiler/common/charmonizer.c
index f34c531..8444497 100644
--- a/compiler/common/charmonizer.c
+++ b/compiler/common/charmonizer.c
@@ -7849,8 +7849,10 @@ S_add_compiler_flags(struct chaz_CLI *cli) {
         chaz_CFlags_append(extra_cflags, "-std=gnu99 -D_GNU_SOURCE");
     }
     else if (chaz_Probe_msvc_version_num()) {
-        /* Compile as C++ under MSVC. */
-        chaz_CFlags_append(extra_cflags, "/TP");
+        if (chaz_Probe_msvc_version_num() < 1800) {
+            /* Compile as C++ under MSVC11 and below. */
+            chaz_CFlags_append(extra_cflags, "/TP");
+        }
 
         /* Thwart stupid warnings. */
         chaz_CFlags_append(extra_cflags, "/D_CRT_SECURE_NO_WARNINGS");

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/e58046c1/compiler/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.main b/compiler/common/charmonizer.main
index d760a7a..48774cd 100644
--- a/compiler/common/charmonizer.main
+++ b/compiler/common/charmonizer.main
@@ -110,8 +110,10 @@ S_add_compiler_flags(struct chaz_CLI *cli) {
         chaz_CFlags_append(extra_cflags, "-std=gnu99 -D_GNU_SOURCE");
     }
     else if (chaz_Probe_msvc_version_num()) {
-        /* Compile as C++ under MSVC. */
-        chaz_CFlags_append(extra_cflags, "/TP");
+        if (chaz_Probe_msvc_version_num() < 1800) {
+            /* Compile as C++ under MSVC11 and below. */
+            chaz_CFlags_append(extra_cflags, "/TP");
+        }
 
         /* Thwart stupid warnings. */
         chaz_CFlags_append(extra_cflags, "/D_CRT_SECURE_NO_WARNINGS");

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/e58046c1/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.c b/runtime/common/charmonizer.c
index 9d8d92a..f9913bb 100644
--- a/runtime/common/charmonizer.c
+++ b/runtime/common/charmonizer.c
@@ -7939,8 +7939,10 @@ S_add_compiler_flags(struct chaz_CLI *cli) {
         chaz_CFlags_append(extra_cflags, "-std=gnu99 -D_GNU_SOURCE");
     }
     else if (chaz_Probe_msvc_version_num()) {
-        /* Compile as C++ under MSVC. */
-        chaz_CFlags_append(extra_cflags, "/TP");
+        if (chaz_Probe_msvc_version_num() < 1800) {
+            /* Compile as C++ under MSVC11 and below. */
+            chaz_CFlags_append(extra_cflags, "/TP");
+        }
 
         /* Thwart stupid warnings. */
         chaz_CFlags_append(extra_cflags, "/D_CRT_SECURE_NO_WARNINGS");

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/e58046c1/runtime/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.main b/runtime/common/charmonizer.main
index 207b607..9ef16dc 100644
--- a/runtime/common/charmonizer.main
+++ b/runtime/common/charmonizer.main
@@ -200,8 +200,10 @@ S_add_compiler_flags(struct chaz_CLI *cli) {
         chaz_CFlags_append(extra_cflags, "-std=gnu99 -D_GNU_SOURCE");
     }
     else if (chaz_Probe_msvc_version_num()) {
-        /* Compile as C++ under MSVC. */
-        chaz_CFlags_append(extra_cflags, "/TP");
+        if (chaz_Probe_msvc_version_num() < 1800) {
+            /* Compile as C++ under MSVC11 and below. */
+            chaz_CFlags_append(extra_cflags, "/TP");
+        }
 
         /* Thwart stupid warnings. */
         chaz_CFlags_append(extra_cflags, "/D_CRT_SECURE_NO_WARNINGS");


Mime
View raw message