X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Fvariables.def;h=9ab02a8702ce9832d4e8f45504a12ef22bacc647;hb=b2fdf9ae72a80857e05f964205e27dd87cd63f67;hp=e3e3fb9978350cb2ba1b5c2872e02310a0a62cc4;hpb=38f20de80cf039db725735a5826336dea826d412;p=feisty_meow.git

diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index e3e3fb99..9ab02a87 100644
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -914,24 +914,23 @@ endif
 ############################################################################
 
 ifeq "$(COMPILER)" "GNU_DARWIN"
-  # Darwin kernel GNU compiler...
+  # Darwin kernel GNU compiler...  really more general macos (MacOS) here these days.
   CC = g++
   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) )
 
   DEFINITIONS += _FILE_OFFSET_BITS=64 
 
   DEPENDENCY_DEFINITIONS += NO_VERSION
-  DEPENDENCY_ADDITIONS = -X/usr/include -X/usr/include/c++/$(COMPILER_VERSION) -X/usr/include/c++/$(COMPILER_VERSION)/tr1 -X/usr/local/include -X/usr/include/linux -X/usr/include/wx-2.8 -X/usr/lib/gcc/i586-suse-linux/$(COMPILER_VERSION)/include -X/usr/lib/gcc/i486-linux-gnu/$(COMPILER_VERSION)/include
+#  DEPENDENCY_ADDITIONS = -X/usr/include -X/usr/include/c++/$(COMPILER_VERSION) -X/usr/include/c++/$(COMPILER_VERSION)/tr1 -X/usr/local/include -X/usr/include/linux -X/usr/include/wx-2.8 -X/usr/lib/gcc/i586-suse-linux/$(COMPILER_VERSION)/include -X/usr/lib/gcc/i486-linux-gnu/$(COMPILER_VERSION)/include
+  DEPENDENCY_ADDITIONS = -X/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include
 
   COMPILER_HEADER_DIR := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include
 #/usr/local/include /usr/include 
-#  export CPATH := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include
-#/System/Library/Frameworks/Foundation.framework/Versions/C/Headers
+#old /System/Library/Frameworks/Foundation.framework/Versions/C/Headers
 #/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include
 #/Library/Developer/CommandLineTools/usr/include
 
@@ -941,11 +940,10 @@ ifeq "$(COMPILER)" "GNU_DARWIN"
 #  ifeq "x86_64" "$(ARCHITECTURE)"
 #    COMPILER_LIBRARY_DIR = /lib64 /usr/lib64 /usr/local/lib64
 #  else
-
-    COMPILER_LIBRARY_DIR = /usr/lib /usr/local/lib
-#/lib 
-
+    COMPILER_LIBRARY_DIR = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib
+#/usr/lib /usr/local/lib
 #  endif
+
 #  DEFINITIONS += __LINUX__ linux __linux__ UNIX unix __UNIX__ __USE_GNU 
   DEFINITIONS += UNIX unix __UNIX__ __USE_GNU 
   # X Window System not enabled by default.
@@ -956,6 +954,8 @@ ifeq "$(COMPILER)" "GNU_DARWIN"
 #  LOAD_FLAG_PREFIX += -Xlinker 
 #mac has no o3???
 #-O3 
+  # special flags for getting rid of warnings on fd_set.
+  LOAD_FLAG_PREFIX=-Wl,-U,___darwin_check_fd_set_overflow
 
 # -Xlinker --print-map : shows what went in and why.
 # -Xlinker -O3 : linker optimization
@@ -977,6 +977,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