Changeset 87614 in vbox

Timestamp:

Feb 4, 2021 7:35:02 PM (4 years ago)

Author:

vboxsync

Message:

/configure: Improvements mainly for macOS. Can now deal with just the command line tools (VirtualBox never needed the full Xcode), looking in the appropriate place when no Xcode directory is specified. Added Big Sur.

File:

• trunk/configure (modified) (9 diffs)

trunk/configure

@@ -194 +194 @@
 {
   rm -f $ODIR.tmp_src.cc $ODIR.tmp_src.c $ODIR.tmp_out $ODIR.test_execute.log
+  [ "$OS" = "darwin" ] && rm -rf $ODIR.tmp_out.dSYM
 }
 
@@ -635 +636 @@
         fail
       else
+        [ "$YASM" != "yasm" ] && cnf_append "PATH_TOOL_YASM" "`dirname $YASM`"
         log_success "found version $yasm_ver"
       fi
@@ -2218 +2220 @@
 
 #
+# Determines the Darwin version.
+#
+check_darwinversion()
+{
+  test_header "Darwin version"
+  darwin_ver=`uname -r`
+  case "$darwin_ver" in
+    20\.*)
+      darwin_ver="11.0" # Big Sur
+      ;;
+    19\.*)
+      darwin_ver="10.15" # Catalina
+      ;;
+    18\.*)
+      darwin_ver="10.14" # Mojave
+      ;;
+    17\.*)
+      darwin_ver="10.13" # High Sierra
+      ;;
+    16\.*)
+      darwin_ver="10.12" # Sierra
+      ;;
+    15\.*)
+      darwin_ver="10.11" # El Capitan
+      ;;
+    14\.*)
+      darwin_ver="10.10" # Yosemite
+      ;;
+    13\.*)
+      darwin_ver="10.9" # Mavericks
+      ;;
+    *)
+      echo "  failed to determine Darwin version. (uname -r: $darwin_ver)"
+      fail
+      darwin_ver="unknown"
+      ;;
+  esac
+
+  log_success "found version $darwin_ver"
+}
+
+#
 # Check Xcode path
 #
-check_xcode_sdk_path()
+check_xcode_path()
 {
     # Check if WITH_XCODE_DIR is set.
     if [ -z "$WITH_XCODE_DIR" ]; then
-        echo "Please specify --with-xcode-dir option."
-        return 0
+        if [ -d "/Library/Developer/CommandLineTools" -a -f "/Library/Developer/CommandLineTools/usr/bin/clang" ]; then
+            return 1
+        else
+            echo "Please specify --with-xcode-dir option."
+            return 0
+        fi
     fi
 
@@ -2237 +2285 @@
 }
 
-#
-# Determines the Darwin version.
-# @todo This should really check the Xcode/SDK version.
-#
-check_darwinversion()
-{
-  test_header "Darwin version"
-  darwin_ver=`uname -r`
-  case "$darwin_ver" in
-    19\.*)
-      darwin_ver="10.15" # Catalina
-      ;;
-    18\.*)
-      darwin_ver="10.14" # Mojave
-      ;;
-    17\.*)
-      darwin_ver="10.13" # High Sierra
-      ;;
-    16\.*)
-      darwin_ver="10.12" # Sierra
-      ;;
-    15\.*)
-      darwin_ver="10.11" # El Capitan
-      ;;
-    14\.*)
-      darwin_ver="10.10" # Yosemite
-      ;;
-    13\.*)
-      darwin_ver="10.9" # Mavericks
-      ;;
-    *)
-      echo "  failed to determine Darwin version. (uname -r: $darwin_ver)"
-      fail
-      darwin_ver="unknown"
-      ;;
-  esac
-
-  check_xcode_sdk_path "$WITH_XCODE_DIR"
+check_xcode()
+{
+  test_header "Xcode and SDK"
+  check_xcode_path "$WITH_XCODE_DIR"
   [ $? -eq 1 ] || fail
 
   # Pick the oldest SDK offered by Xcode, to get maximum compatibility
-  devel_subdir="$WITH_XCODE_DIR/Contents/Developer"
-  sdk_subdir="$devel_subdir/Platforms/MacOSX.platform/Developer/SDKs"
+  if [ -z "$WITH_XCODE_DIR" ]; then
+    devel_subdir="/Library/Developer/CommandLineTools"
+    sdk_subdir="$devel_subdir/SDKs"
+  else
+    devel_subdir="$WITH_XCODE_DIR/Contents/Developer"
+    sdk_subdir="$devel_subdir/Platforms/MacOSX.platform/Developer/SDKs"
+  fi
   sdk_tries="$sdk_subdir"/MacOSX10.?.sdk" $sdk_subdir"/MacOSX10.??.sdk" $sdk_subdir"/MacOSX.sdk
   for t in $sdk_tries; do
@@ -2292 +2311 @@
     fail
   fi
-
-  cnf_append "VBOX_WITH_MACOSX_COMPILERS_FROM_DEVEL" "1"
-  cnf_append "PATH_TOOL_VBoxXcode62" "$devel_subdir"
-  cnf_append "VBOX_PATH_MACOSX_DEVEL_ROOT" "$devel_subdir"
+  xcode_ver=`$devel_subdir/usr/bin/clang --version | sed -n 's/^.*version \([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\).*$/\1/p'`
+  if [ $? -ne 0 -o -z "$xcode_ver" ]; then
+    echo "  failed to determine Xcode version."
+    fail
+  fi
+
+  if [ -z "$WITH_XCODE_DIR" ]; then
+    cnf_append "VBOX_WITH_EVEN_NEWER_XCODE" "1"
+  else
+    cnf_append "VBOX_WITH_MACOSX_COMPILERS_FROM_DEVEL" "1"
+    cnf_append "PATH_TOOL_VBoxXcode62" "$devel_subdir"
+    cnf_append "VBOX_PATH_MACOSX_DEVEL_ROOT" "$devel_subdir"
+  fi
   cnf_append "VBOX_PATH_MACOSX_SDK" "$sdk"
   if [ -n "$sdk_ver" ]; then
@@ -2302 +2330 @@
   fi
 
-  log_success "found version $darwin_ver (SDK: $sdk)"
+  log_success "found version $xcode_ver (SDK: $sdk)"
 }
 
@@ -2373 +2401 @@
   --with-kbuild=DIR        kbuild directory [$KBUILDDIR]
   --with-iasl=PATH         location of the iasl compiler [$IASL]
+  --with-yasm=PATH         location of the iasl compiler [$YASM]
   --with-makeself=PATH     location of makeself [$MAKESELF]
 EOF
@@ -2504 +2533 @@
       IASL=`echo $option | cut -d'=' -f2`
       ;;
+    --with-yasm=*)
+      YASM=`echo $option | cut -d'=' -f2`
+      ;;
     --with-xcode-dir=*)
       WITH_XCODE_DIR=`echo $option | cut -d'=' -f2`
-      echo $option
       ;;
     --with-linux=*)
@@ -2791 +2822 @@
 
 # Darwin-specific
-if [ "$OS" = "darwin" ]; then
-  check_darwinversion
-fi
+[ "$OS" = "darwin" ] && check_darwinversion
 # the tools
-check_gcc
+[ "$OS" != "darwin"  ] && check_gcc
+[ "$OS" = "darwin"  ] && check_xcode
 if [ $ONLY_ADDITIONS -eq 0 ]; then
   check_open_watcom