simplify per compiler rules and variables

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

diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index 358e41a4b71eec74b7e7eacda7cbeb3e756009bc..2eca5786631f36da65b26fed93114e9bbee62104 100644 (file)
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -439,9 +439,9 @@ ifeq "$(CLAM_COMPILER)" "GNU_LINUX"
   CC = g++
 #  CLAM_COMPILER_ROOT_DIR = /
   PLATFORM_ADD_IN = linux_
-#  ARCHITECTURE = $(shell machine 2>/dev/null || arch 2>/dev/null || echo i686)
+##  ARCHITECTURE = $(shell machine 2>/dev/null || arch 2>/dev/null || echo i686)
 
-  export CLAM_COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(CLAM_COMPILER) $(CLAM_COMPILER_ROOT_DIR) )
+##  export CLAM_COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(CLAM_COMPILER) $(CLAM_COMPILER_ROOT_DIR) )
 
   DEFINITIONS += _FILE_OFFSET_BITS=64 
 
@@ -527,7 +527,7 @@ ifeq "$(CLAM_COMPILER)" "GNU_ARM_LINUX"
   CC = $(CLAM_COMPILER_ROOT_DIR)/bin/g++
   PLATFORM_ADD_IN = linux_
 
-  export CLAM_COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(CLAM_COMPILER) $(CLAM_COMPILER_ROOT_DIR) )
+##  export CLAM_COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(CLAM_COMPILER) $(CLAM_COMPILER_ROOT_DIR) )
 
   SNAPGEAR_ROOT_DIR = $(HOME)/snapgear
 
@@ -576,7 +576,7 @@ ifeq "$(CLAM_COMPILER)" "GNU_WINDOWS"
 ##hmmm: below fixes nothing!  argh!
 ##  ARCHITECTURE = i386
 
-  export CLAM_COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(CLAM_COMPILER) $(CLAM_COMPILER_ROOT_DIR) )
+##  export CLAM_COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(CLAM_COMPILER) $(CLAM_COMPILER_ROOT_DIR) )
 
 #  RC := $(CLAM_COMPILER_ROOT_DIR)/bin/windres
   PLATFORM_ADD_IN = w32_
@@ -617,7 +617,7 @@ ifeq "$(CLAM_COMPILER)" "GNU_DARWIN"
   PLATFORM_ADD_IN = darwin
 ##  ARCHITECTURE = $(shell machine 2>/dev/null || arch 2>/dev/null || echo i686)
 
-  export CLAM_COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(CLAM_COMPILER) $(CLAM_COMPILER_ROOT_DIR) )
+##  export CLAM_COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(CLAM_COMPILER) $(CLAM_COMPILER_ROOT_DIR) )
 
   DEFINITIONS += _FILE_OFFSET_BITS=64 
 
@@ -634,12 +634,12 @@ ifeq "$(CLAM_COMPILER)" "GNU_DARWIN"
   # "USE_XWIN" specifies that this project needs X window system support.
   #USE_XWIN =
 
-#  ifeq "x86_64" "$(ARCHITECTURE)"
-#    COMPILER_LIBRARY_DIR = /lib64 /usr/lib64 /usr/local/lib64
-#  else
+  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
+  endif
 
 #  DEFINITIONS += __LINUX__ linux __linux__ UNIX unix __UNIX__ __USE_GNU 
   DEFINITIONS += UNIX unix __UNIX__ __USE_GNU