resurrecting the gnu c++ build on windows

[feisty_meow.git] / scripts / clam / cpp / variables.def

diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index 95933297d3a08c1def9575bdca99ed87f2d61d50..62c097f691bbc29c53ba57ad6908d4baa6b88c92 100644 (file)
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -60,7 +60,8 @@ endif
 # code.  It is mainly used within CLAM itself for determining the proper
 # compiler flags.
 export COMPILER
-#COMPILER := GNU_LINUX | GNU_ARM_LINUX | GNU_DARWIN | GNU_WINDOWS | VISUAL_CPP
+#COMPILER := GNU_LINUX | GNU_ARM_LINUX | GNU_DARWIN | GNU_WINDOWS 
+##| VISUAL_CPP
 
 # choose a default compiler if none was specified.
 ifeq "$(COMPILER)" ""
@@ -72,8 +73,8 @@ ifeq "$(COMPILER)" ""
     endif
   endif
   ifeq "$(OP_SYSTEM)" "WIN32"
-#    COMPILER := GNU_WINDOWS
-    COMPILER := VISUAL_CPP
+    COMPILER := GNU_WINDOWS
+#    COMPILER := VISUAL_CPP
   endif
   ifeq "$(COMPILER)" ""
     # if we get into this case, we have no idea how to set the default
@@ -462,7 +463,9 @@ endif
 # compiler specific section below.
 ############################################################################
 
-ifeq "$(COMPILER)" "GNU_LINUX"
+# wide open match of any compiler besides gnu darwin.
+#hmmm: this will erroneously match the arm one.  but have we used that in a while?
+ifneq "$(COMPILER)" "GNU_DARWIN"
   # Unix GNU compiler...
   CC = g++
   COMPILER_ROOT_DIR = /
@@ -635,6 +638,8 @@ endif
 ifeq "$(COMPILER)" "VISUAL_CPP"
   # microsoft visual c++ 4.x, 5.x or 6.x.
 
+bork bork should not be here.
+
   PLATFORM_ADD_IN = w32_
 
   TRIPART_VERSION =
@@ -919,7 +924,6 @@ ifeq "$(COMPILER)" "GNU_DARWIN"
   COMPILER_ROOT_DIR = /
   PLATFORM_ADD_IN = darwin
   ARCHITECTURE = $(shell machine 2>/dev/null || arch 2>/dev/null || echo i686)
-#  COMPILER_FLAGS += -fgnu-runtime
 
   export COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(COMPILER) $(COMPILER_ROOT_DIR) )
 
@@ -978,6 +982,11 @@ ifeq "$(COMPILER)" "GNU_DARWIN"
      # pthread=thread libraries.
      # rt=real time libraries for shared memory.
 
+  # mac specific flags
+  COMPILER_FLAGS += -Wno-nullability-completeness
+#trying this one again, which had been turned off.
+  COMPILER_FLAGS += -fgnu-runtime
+
   ifneq "$(DEBUG)" ""
     # add in debugging flags.
 #    COMPILER_FLAGS += -g3 -O0