Changeset 5533 in vbox

Timestamp:

Oct 27, 2007 1:52:52 AM (17 years ago)

Author:

vboxsync

Message:

Use isainfo on solaris. add -m64 to the gcc/g++ tests (don't bother with the TOOL_G* stuff because Config.kmk does this).

File:

• trunk/configure (modified) (4 diffs)

trunk/configure

@@ -230 +230 @@
 {
   test_header environment
+  OS=`uname -s | sed -e 's/GNU\/Linux/Linux/g' | tr [:upper:] [:lower:]`
+  case "$OS" in
+    linux)
+      ;;
+    darwin)
+      ;;
+    freebsd)
+      ;;
+    sunos)
+      OS='solaris'
+      ;;
+    *)
+      log_failure "Cannot determine OS"
+      exit 1
+      ;;
+  esac
   BUILD_CPU=`uname -m`
+  [ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '`
   case "$BUILD_CPU" in
     i[3456789]86|x86|i86pc)
@@ -250 +267 @@
   [ -z "$TARGET_MACHINE" ] && TARGET_MACHINE=$BUILD_MACHINE
   [ -z "$TARGET_CPU"     ] && TARGET_CPU=$BUILD_CPU
-  OS=`uname -s | sed -e 's/GNU\/Linux/Linux/g' | tr [:upper:] [:lower:]`
-  case "$OS" in
-    linux)
-      ;;
-    darwin)
-      ;;
-    freebsd)
-      ;;
-    sunos)
-      OS='solaris'
-      ;;
-    *)
-      log_failure "Cannot determine OS"
-      exit 1
-      ;;
-  esac
   DEVDIR_BIN="$DEVDIR/$OS.$BUILD_MACHINE/bin"
   KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.$BUILD_MACHINE"
@@ -349 +350 @@
         cnf_append "TOOL_GXX32_LD"  "$CXX32"
       fi
+      # this isn't not necessary, there is not such tool.
       if [ -n "$CC64" ]; then
         cnf_append "TOOL_GCC64_CC"  "$CC64"
@@ -361 +363 @@
         cnf_append "TOOL_GXX64_LD"  "$CXX64"
       fi
+      # Solaris sports a 32-bit gcc/g++.
+      if [ "$OS" = "solaris" -a "$BUILD_MACHINE" = "amd64" ]; then
+        [ "$CC" = "gcc" ] && CC="gcc -m64"
+        [ "$CXX" = "g++" ] && CXX="g++ -m64"
+      fi 
     fi
   fi