Changeset 2523 in vbox for trunk/Config.kmk

Timestamp:

May 7, 2007 12:03:41 PM (18 years ago)

Author:

vboxsync

Message:

workaround for the windows ash issue.

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -830 +830 @@
    else echo "$(2)"; fi; )
 
+# This is kind of bad, the returned string needs to be re-evaluated before use.
+# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)). 
 VBOX_GCC_VERSION = $(shell \
-   echo "$$((`$(1) -dumpversion | sed 's|\([0-9]\)\.\([0-9]\)\.\([0-9]\)|10000 * \1 + 100 * \2 + \3|'`))")
+  $(1) -dumpversion | sed 's|\([0-9]\)\.\([0-9]\)\.\([0-9]\)|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, \2), \3)|' )
 
 # No $(QUIET) here as it's interesting to see what goes into the file.
@@ -850 +852 @@
         @# Set default attribute for ELF and MACH-O symbols to ``hidden'' to reduce the number
         @# of relocation entries and PLT indirections in shared libraries. Don't allow for gcc version < 4.
-        $(APPEND) "$@" "VBOX_GCC_fvisibility-hidden    ?= $(if $(shell \
-          [ $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC)) -ge 40000 ] && echo 'ok'),$(call \
-            VBOX_GCC_CHECK_CC,-fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN,),)"
+        $(APPEND) "$@" "ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CC),40000),)"
+        $(APPEND) "$@" " VBOX_GCC_fvisibility-hidden    ?= $(call VBOX_GCC_CHECK_CC,-fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN,)"
+        $(APPEND) "$@" "endif"
         @# Set default attribute for inline functions to ``hidden'' to reduce the number
         @# of relocation entries and PLT indirections in shared libraries. Don't allow for gcc version < 4.
-        $(APPEND) "$@" "VBOX_GCC_fvisibility-inlines-hidden ?= $(if $(shell \
-          [ $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC)) -ge 40000 ] && echo 'ok'),$(call \
-            VBOX_GCC_CHECK_CXX,-fvisibility-inlines-hidden,),)"
+        $(APPEND) "$@" "ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40000),)"
+        $(APPEND) "$@" " VBOX_GCC_fvisibility-inlines-hidden ?= $(call VBOX_GCC_CHECK_CXX,-fvisibility-inlines-hidden,)"
+        $(APPEND) "$@" "endif"
         @# Find the compiler includes for IPRT no-crt.
         $(APPEND) "$@" "VBOX_PATH_GCC_INCS             ?= $(abspath $(dir $(shell LC_ALL=C $(TOOL_$(VBOX_GCC_TOOL)_CC) -print-libgcc-file-name)))/include"