X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Fvariables.def;h=0ba91e04f275e15e85c5aefeb91236f5226f3563;hb=de0da7f2f7958d4ba652ff2ef5c79991700141ac;hp=24b8148c514168a404dba2bd26170eddde881489;hpb=49620656530053aec1cc10157d63cd52bf7e8168;p=feisty_meow.git

diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index 24b8148c..0ba91e04 100644
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -21,52 +21,6 @@ include variables.def
 
 ###############################################################################
 
-#export CLAM_BINARIES = $(CLAM_SCRIPTS)/../bin
-
-###############################################################################
-
-# BASE_CPU is a flag that distinguishes the type of processor, if necessary.
-export BASE_CPU
-#BASE_CPU := m68k = motorola 68000 series | m68340 = motorola 68340
-#    | x86 = intel x86 | ppc = power pc | arm = ARM core
-
-# set the CPU to a default if it has not been set previously.
-ifeq "$(BASE_CPU)" ""
-  BASE_CPU := $(shell machine 2>/dev/null || arch 2>/dev/null || uname -m 2>/dev/null || echo i686)
-endif
-
-# COMPILER is a flag that specifies the compiler that will be used to build
-# 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 
-
-# choose a default compiler if none was specified.
-ifeq "$(COMPILER)" ""
-  ifeq "$(OP_SYSTEM)" "UNIX"
-    ifeq "$(OS_SUBCLASS)" "darwin"
-      COMPILER := GNU_DARWIN
-    else
-      COMPILER := GNU_LINUX
-    endif
-  endif
-  ifeq "$(OP_SYSTEM)" "WIN32"
-    COMPILER := GNU_WINDOWS
-  endif
-  ifeq "$(COMPILER)" ""
-    # if we get into this case, we have no idea how to set the default
-    # compiler.  you may need to change the above logic for guessing it
-    # anyhow.  but we will go with our favorite default.
-    COMPILER := GNU_LINUX
-  endif
-endif
-
-# COMPILER_VERSION specifies the version of a particular compiler, if this is
-# needed to distinguish how the code is built.
-export COMPILER_VERSION
-
-###############################################################################
-
 # "TYPE" is the kind of product being generated by this project.  this is
 # used to decide where to put the final products of compilation.  this is a
 # variable in the user makefile.
@@ -176,9 +130,9 @@ export OUTPUT_ROOT = $(CLAM_TMP)/objects
 # "CPU_BUILD_DIR" distinguishes object directories by including the CPU
 # name and the type of build.
 ifneq "$(DEBUG)" ""
-  CPU_BUILD_DIR = $(BASE_CPU)_$(PLATFORM_ADD_IN)dbg
+  CPU_BUILD_DIR = $(CLAM_BASE_CPU)_$(PLATFORM_ADD_IN)dbg
 else
-  CPU_BUILD_DIR = $(BASE_CPU)_$(PLATFORM_ADD_IN)rel
+  CPU_BUILD_DIR = $(CLAM_BASE_CPU)_$(PLATFORM_ADD_IN)rel
 endif
 
 # "BASE_OUTPUT_PATH" is the parent directory of objects for this type of
@@ -186,7 +140,7 @@ endif
 export BASE_OUTPUT_PATH = $(OUTPUT_ROOT)/$(CPU_BUILD_DIR)
 
 # special case when doing arm-linux builds
-ifeq "$(COMPILER)" "GNU_ARM_LINUX"
+ifeq "$(CLAM_COMPILER)" "GNU_ARM_LINUX"
   export TARGETS_STORE = $(FEISTY_MEOW_APEX)/$(CPU_BUILD_DIR)
   # special output directory for firmware does not include CPU name because
   #  the repository already include the CPU name
@@ -206,21 +160,9 @@ export DYNAMIC_LIBRARY_DIR = $(TARGETS_STORE)
 export STATIC_LIBRARY_DIR = $(TARGETS_STORE)
 
 # "HEADER_SEARCH_PATH" is where the class interface files are to be found.
-# we add the generated store folder for the build version file.
-HEADER_SEARCH_PATH = $(FEISTY_MEOW_GENERATED_STORE)/versions
-
-# "HOOPLE_HEADERS" are locations where the HOOPLE headers can be found.
-ifeq "$(HOOPLE_HEADERS)" ""
-#seems like some of this is redundant with earlier 3rdparty exploring.
-  LOCUS_LIBRARY_HEADERS = $(shell bash -c '\
-    if [ -d "$(FEISTY_MEOW_APEX)/nucleus" ]; then \
-      echo "$(FEISTY_MEOW_APEX)/nucleus" "$(FEISTY_MEOW_APEX)/octopi" "$(FEISTY_MEOW_APEX)/graphiq" ; \
-    else \
-      echo ""; \
-    fi | tr "\\\\" / | sed -e "s/\([a-zA-Z]\):\/\([^ ]*\)/\/cygdrive\/\1\/\2/g" ')
-    # above assumes cygwin support for windows!  was assuming msys support.
-  HOOPLE_HEADERS := $(shell $(FIND) $(LOCUS_LIBRARY_HEADERS) -mindepth 1 -maxdepth 1 -type d )
-endif
+# the generated store folder is added to access the build version file.
+# the binaries are added to access the system_helper.h file.
+HEADER_SEARCH_PATH = $(FEISTY_MEOW_GENERATED_STORE)/versions $(FEISTY_MEOW_BINARIES)
 
 # "LOCAL_HEADERS" are overrides that go first in the header search path.
 LOCAL_HEADERS = $(THIRD_PARTY_DIR)
@@ -381,9 +323,12 @@ LIBRARY_PATH_FLAG = -L
 # The name of the library creator tool.
 #LIBRARY_TOOL =
 
-# the root name of the version file.  This is currently irrelevant on
-# non-windoze platforms.
-VERSION_RC_ROOT = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/rc_name.sh)
+ifeq "$(OPERATING_SYSTEM)" "WIN32"
+  # the root name of the version file.  This is currently irrelevant on
+  # non-windoze platforms.
+  #CLAM_VERSION_RC_ROOT = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/rc_name.sh)
+  #hmmm: also currently irrelevant since we are only doing static builds.
+endif
 
 ifneq "$(CONSOLE_MODE)" ""
   # this definition can be used to signal different behavior when the app is
@@ -404,23 +349,25 @@ DYNLIB_ENDING = .so
 
 # Compiler Dependent Flags
 #
-# "COMPILER_ROOT_DIR" is the top-level for the C++ compiler location.
-export COMPILER_ROOT_DIR
+# "CLAM_COMPILER_ROOT_DIR" is the top-level for the C++ compiler location.
 # "COMPILER_HEADER_DIR" is where the compiler headers are.
-export COMPILER_HEADER_DIR
 # "COMPILER_LIBRARY_DIR" is where archived libraries are.
 # "CC" is the name of the C++ compiler to be used.
+export COMPILER_HEADER_DIR
 
 # These flags may be useful across multiple compilers.
 #
-# SSL brings in the OpenSSL libraries.
-USE_SSL=
+# "USE_SSL" brings in the OpenSSL libraries.
+#USE_SSL =
+
+# "USE_CURL" provides access to the curl library.
+#USE_CURL =
 
-# CURL provides access to the curl library.
-USE_CURL=
+# "USE_WXWIDGETS" enables wxwidget library support.
+#USE_WXWIDGETS =
 
-# Enables wxwidget library support.
-USE_WXWIDGETS=
+# "USE_XWIN" specifies that this project needs X window system support.
+#USE_XWIN =
 
 ifneq "$(OMIT_VERSIONS)" ""
   DEFINITIONS += NO_VERSION
@@ -430,29 +377,24 @@ endif
 # compiler specific section below.
 ############################################################################
 
-ifeq "$(COMPILER)" "GNU_LINUX"
+ifeq "$(CLAM_COMPILER)" "GNU_LINUX"
   # Unix GNU compiler...
   CC = g++
-  COMPILER_ROOT_DIR = /
   PLATFORM_ADD_IN = linux_
-  ARCHITECTURE = $(shell machine 2>/dev/null || arch 2>/dev/null || echo i686)
-
-  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 -X/usr/lib/gcc/i686-linux-gnu/$(COMPILER_VERSION)/include -X/usr/lib/gcc/x86_64-linux-gnu/$(COMPILER_VERION)/include -X/usr/include/x86_64-linux-gnu -X/usr/include/i386-linux-gnu
-
-  # "USE_XWIN" specifies that this project needs X window system support.
-  #USE_XWIN =
+#hmmm: uggh, can we clean up this huge list of dep adds somehow?
+  DEPENDENCY_ADDITIONS = -X/usr/include -X/usr/include/c++/$(CLAM_COMPILER_VERSION) -X/usr/include/c++/$(CLAM_COMPILER_VERSION)/tr1 -X/usr/local/include -X/usr/include/linux -X/usr/include/wx-2.8 -X/usr/lib/gcc/i586-suse-linux/$(CLAM_COMPILER_VERSION)/include -X/usr/lib/gcc/i486-linux-gnu/$(CLAM_COMPILER_VERSION)/include -X/usr/lib/gcc/i686-linux-gnu/$(CLAM_COMPILER_VERSION)/include -X/usr/lib/gcc/x86_64-linux-gnu/$(COMPILER_VERION)/include -X/usr/include/x86_64-linux-gnu -X/usr/include/i386-linux-gnu
 
-  ifeq "x86_64" "$(ARCHITECTURE)"
-    COMPILER_LIBRARY_DIR = /lib64 /usr/lib64 /usr/local/lib64
-  else
-    COMPILER_LIBRARY_DIR = /lib /usr/lib /usr/local/lib
-  endif
+#  ifeq "x86_64" "$(CLAM_BASE_CPU)"
+#    COMPILER_LIBRARY_DIR = /lib64 /usr/lib64 /usr/local/lib64
+#  else
+#    COMPILER_LIBRARY_DIR = /lib /usr/lib /usr/local/lib
+#  endif
   DEFINITIONS += __LINUX__ linux __linux__ UNIX unix __UNIX__ __USE_GNU 
+
+#hmmm: move to an x win enabling area.
   # X Window System not enabled by default.
   #DEFINITIONS += __XWINDOWS__ 
 
@@ -466,6 +408,8 @@ ifeq "$(COMPILER)" "GNU_LINUX"
     # space on end is significant.
   LINKER_OUTPUT_FLAG = -o 
   LINK_TOOL = g++
+
+  COMPILER_FLAGS += -shared-libgcc -fPIC  
   # compiler flags for gcc:
   # -finline-functions: inline functions as needed.
   # -fPIC: generate position independent code.
@@ -476,8 +420,6 @@ ifeq "$(COMPILER)" "GNU_LINUX"
   # -shared-libgcc: use the shared library version of compiler libraries.
   # -fno-exceptions: do not support exception handling and stack unwinding.
 
-  COMPILER_FLAGS += -shared-libgcc -fPIC  
-
   ifeq "$(DEBUG)" ""
 #    COMPILER_FLAGS += -finline-functions 
   endif
@@ -514,24 +456,71 @@ endif
 
 ############################################################################
 
-ifeq "$(COMPILER)" "GNU_ARM_LINUX"
+ifeq "$(CLAM_COMPILER)" "GNU_DARWIN"
+  # Darwin kernel GNU compiler...  really more general macos (MacOS) here these days.
+  CC = g++
+  PLATFORM_ADD_IN = darwin
+  DEFINITIONS += _FILE_OFFSET_BITS=64 
+
+  DEPENDENCY_DEFINITIONS += NO_VERSION
+#  DEPENDENCY_ADDITIONS = -X/usr/include -X/usr/include/c++/$(CLAM_COMPILER_VERSION) -X/usr/include/c++/$(CLAM_COMPILER_VERSION)/tr1 -X/usr/local/include -X/usr/include/linux -X/usr/include/wx-2.8 -X/usr/lib/gcc/i586-suse-linux/$(CLAM_COMPILER_VERSION)/include -X/usr/lib/gcc/i486-linux-gnu/$(CLAM_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 
+#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
+
+#  ifeq "x86_64" "$(CLAM_BASE_CPU)"
+#    COMPILER_LIBRARY_DIR = /lib64 /usr/lib64 /usr/local/lib64
+#  else
+#    COMPILER_LIBRARY_DIR = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib
+##/usr/lib /usr/local/lib
+#  endif
+
+  DEFINITIONS += UNIX unix __UNIX__ __USE_GNU 
+
+  LIBRARY_TOOL = ar
+  LIB_PREFIX = lib
+  # special flags for getting rid of warnings on fd_set.
+  LOAD_FLAG_PREFIX=-Wl,-U,___darwin_check_fd_set_overflow
+
+  CREATE_LIBRARY_FLAG += -r 
+    # space on end is significant.
+  LINKER_OUTPUT_FLAG = -o 
+  LINK_TOOL = g++
+
+  # 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
+  endif
+endif
+
+############################################################################
+
+ifeq "$(CLAM_COMPILER)" "GNU_ARM_LINUX"
   # ARM-linux GNU compiler...
-  COMPILER_ROOT_DIR = /usr/local/arm-linux
-  CC = $(COMPILER_ROOT_DIR)/bin/g++
-  PLATFORM_ADD_IN = linux_
 
-  export COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(COMPILER) $(COMPILER_ROOT_DIR) )
+##  CLAM_COMPILER_ROOT_DIR = /usr/local/arm-linux
+#hmmm: the above is the one we may need to integrate into build_variables.sh
 
+  CC = $(CLAM_COMPILER_ROOT_DIR)/bin/g++
+  PLATFORM_ADD_IN = linux_
   SNAPGEAR_ROOT_DIR = $(HOME)/snapgear
-
   DEPENDENCY_DEFINITIONS += NO_VERSION
 
   COMPILER_HEADER_DIR = $(SNAPGEAR_ROOT_DIR)/linux-2.4.x/include
 #  COMPILER_HEADER_DIR += $(SNAPGEAR_ROOT_DIR)/include 
-  COMPILER_HEADER_DIR += $(COMPILER_ROOT_DIR)/include $(COMPILER_ROOT_DIR)/lib 
+  COMPILER_HEADER_DIR += $(CLAM_COMPILER_ROOT_DIR)/include $(CLAM_COMPILER_ROOT_DIR)/lib 
   COMPILER_HEADER_DIR += /usr/local/lib/gcc-lib/arm-linux/3.3.2/include
   
-  COMPILER_LIBRARY_DIR = $(SNAPGEAR_ROOT_DIR)/lib $(COMPILER_ROOT_DIR)/lib/be
+  COMPILER_LIBRARY_DIR = $(SNAPGEAR_ROOT_DIR)/lib $(CLAM_COMPILER_ROOT_DIR)/lib/be
 
   DEFINITIONS += linux __linux__ unix UNIX __UNIX__ __LINUX__ 
 
@@ -540,12 +529,12 @@ ifeq "$(COMPILER)" "GNU_ARM_LINUX"
     COMPILER_FLAGS += -Wall -Werror
   endif
 
-  LIBRARY_TOOL = $(COMPILER_ROOT_DIR)/bin/ar
+  LIBRARY_TOOL = $(CLAM_COMPILER_ROOT_DIR)/bin/ar
   LIB_PREFIX = lib
   CREATE_LIBRARY_FLAG += -r 
     # space on end is significant.
   
-  LINK_TOOL = $(COMPILER_ROOT_DIR)/bin/g++
+  LINK_TOOL = $(CLAM_COMPILER_ROOT_DIR)/bin/g++
   LINKER_OUTPUT_FLAG = -o
   EXE_FLAGS = -mbig-endian
   LOAD_FLAG_PREFIX += -v -mbig-endian
@@ -560,33 +549,23 @@ endif
 
 ############################################################################
 
-ifeq "$(COMPILER)" "GNU_WINDOWS"
+ifeq "$(CLAM_COMPILER)" "GNU_WINDOWS"
   # GNU compiler for MS Windoze...
   CC = g++
-  COMPILER_ROOT_DIR = /
-  ARCHITECTURE = $(shell machine 2>/dev/null || arch 2>/dev/null || echo i686)
-#hmmm: below fixes nothing!  argh!
-#  ARCHITECTURE = i386
-
-  export COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(COMPILER) $(COMPILER_ROOT_DIR) )
-
-#  RC := $(COMPILER_ROOT_DIR)/bin/windres
+#  RC := $(CLAM_COMPILER_ROOT_DIR)/bin/windres
   PLATFORM_ADD_IN = w32_
 
-  COMPILER_HEADER_DIR = $(COMPILER_ROOT_DIR)/include $(COMPILER_ROOT_DIR)/include/c++/3.4.2 
-#$(COMPILER_ROOT_DIR)/lib/gcc/mingw32/3.4.2/include 
-###$(COMPILER_ROOT_DIR)/usr/include/mingw $(COMPILER_ROOT_DIR)/usr/include $(COMPILER_ROOT_DIR)/usr/include/w32api $(COMPILER_ROOT_DIR)/usr/include/extras
+  COMPILER_HEADER_DIR = $(CLAM_COMPILER_ROOT_DIR)/include $(CLAM_COMPILER_ROOT_DIR)/include/c++/3.4.2 
+#$(CLAM_COMPILER_ROOT_DIR)/lib/gcc/mingw32/3.4.2/include 
+###$(CLAM_COMPILER_ROOT_DIR)/usr/include/mingw $(CLAM_COMPILER_ROOT_DIR)/usr/include $(CLAM_COMPILER_ROOT_DIR)/usr/include/w32api $(CLAM_COMPILER_ROOT_DIR)/usr/include/extras
 
-  COMPILER_LIBRARY_DIR = $(COMPILER_ROOT_DIR)/lib
-  DEFINITIONS += __GNU_WINDOWS__ _Windows _WINDOWS WIN32 __WIN32__ __FLAT__ VC_EXTRALEAN WIN32_LEAN_AND_MEAN ATL_NO_LEAN_AND_MEAN _WIN32 __USE_W32_SOCKETS
-#__cplusplus 
-#__USE_GNU 
+  COMPILER_LIBRARY_DIR = $(CLAM_COMPILER_ROOT_DIR)/lib
+  DEFINITIONS += __GNU_WINDOWS__ _Windows _WINDOWS WIN32 __WIN32__ __FLAT__ VC_EXTRALEAN WIN32_LEAN_AND_MEAN ATL_NO_LEAN_AND_MEAN _WIN32 
 
   LIBRARY_TOOL = ar
   LIBRARY_PATH_FLAG = -L 
   LIB_PREFIX = lib
   LIB_ENDING = .a
-#  LOAD_FLAG_PREFIX += -lpthread
   LOAD_FLAG_PREFIX += -mwindows
   CREATE_LIBRARY_FLAG += -r 
     # space on end is significant.
@@ -595,85 +574,9 @@ ifeq "$(COMPILER)" "GNU_WINDOWS"
   MIDL = midl -Oicf $(MIDL_DEFS) $(HEADER_SEARCH_PATH:%=-I% ) $(DEFINITIONS:%=-D% )
   MIDL_DEFS = -no_robust
   # some lovely definitions used by some of the mfc and other ms code.
-  DEPENDENCY_DEFINITIONS += __cplusplus __MINGW32__ _WIN32 _CHAR_UNSIGNED M_I86 _M_I86 _M_IX86=500 _WIN32_WINNT=0x501 __RPC_WIN32__ __RPCNDR_H_VERSION__ __RPCPROXY_H_VERSION__ TARGET_IS_NT40_OR_LATER PGM_SETCHILD _MFC_VER=0x0600
-
-endif
-
-############################################################################
-
-ifeq "$(COMPILER)" "GNU_DARWIN"
-  # 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)
-
-  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/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 
-#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
-
-  # "USE_XWIN" specifies that this project needs X window system support.
-  #USE_XWIN =
+  DEPENDENCY_DEFINITIONS += __cplusplus __MINGW32__ _WIN32 _CHAR_UNSIGNED M_I86 _M_I86 _M_IX86=500 _WIN32_WINNT=0x501 __RPC_WIN32__ __RPCNDR_H_VERSION__ __RPCPROXY_H_VERSION__ TARGET_IS_NT40_OR_LATER PGM_SETCHILD 
+#hmmm: yuck; re-evaluate need for the above dep defs.
 
-#  ifeq "x86_64" "$(ARCHITECTURE)"
-#    COMPILER_LIBRARY_DIR = /lib64 /usr/lib64 /usr/local/lib64
-#  else
-    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.
-  #DEFINITIONS += __XWINDOWS__ 
-
-  LIBRARY_TOOL = ar
-  LIB_PREFIX = lib
-#  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
-  CREATE_LIBRARY_FLAG += -r 
-    # space on end is significant.
-  LINKER_OUTPUT_FLAG = -o 
-  LINK_TOOL = g++
-#  COMPILER_FLAGS += -shared-libgcc -fPIC  
-#old: -Wl,-export-dynamic
-#  ifeq "$(DEBUG)" ""
-#    COMPILER_FLAGS += -finline-functions 
-#  endif
-#  ifneq "$(STRICT_WARNINGS)" ""
-#    COMPILER_FLAGS += -Wall -Werror -Wextra -pedantic-errors -Wno-long-long
-#  endif
-#  LIBS_USED += dl pthread rt 
-#mac no like these libs
-     # dl=dynamic library.
-     # 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
-  endif
 endif
 
 ############################################################################
@@ -681,7 +584,7 @@ endif
 # these activities are done after the compiler specific stuff.
 
 # add a definition for programs to be able to differentiate the versions.
-DEFINITIONS += COMPILER_VERSION=$(COMPILER_VERSION)
+DEFINITIONS += CLAM_COMPILER_VERSION=$(CLAM_COMPILER_VERSION)
 
 # set a variable that scripts can use to get most of the definitions.
 export VARIABLE_DEFINITION_SET := $(DEFINITIONS)