X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Fvariables.def;h=95933297d3a08c1def9575bdca99ed87f2d61d50;hb=13e6a7529652a303b74b5c5235e8046e029f0576;hp=e3e3fb9978350cb2ba1b5c2872e02310a0a62cc4;hpb=c3206cdf9dd132c4f1d0d0e9300991d284e2bc78;p=feisty_meow.git diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def index e3e3fb99..95933297 100644 --- a/scripts/clam/cpp/variables.def +++ b/scripts/clam/cpp/variables.def @@ -914,7 +914,7 @@ 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 @@ -926,12 +926,12 @@ ifeq "$(COMPILER)" "GNU_DARWIN" 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 +941,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 +955,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