Bug 1400533: Disable xcode installation checking when using tooltool provided OSX SDK. draft
authorTom Prince <mozilla@hocat.ca>
Wed, 27 Sep 2017 14:33:17 -0600
changeset 22685 fb3ab07b2bd67f9419a99e49daa6e9c8053f61f8
parent 22683 56bef3d0c550acf9e9976bc9aba2d6bfa0c49694
push id105
push userbmo:mozilla@hocat.ca
push dateWed, 27 Sep 2017 20:38:43 +0000
bugs1400533
Bug 1400533: Disable xcode installation checking when using tooltool provided OSX SDK. MozReview-Commit-ID: DrgjJBboPIj
build/macosx/local-mozconfig.common
--- a/build/macosx/local-mozconfig.common
+++ b/build/macosx/local-mozconfig.common
@@ -22,16 +22,19 @@ fi
 
 if [ -d $TOOLTOOL_DIR/MacOSX10.10.sdk ]; then
     export CROSS_SYSROOT=$TOOLTOOL_DIR/MacOSX10.10.sdk
     CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks
     FLAGS="-isysroot $CROSS_SYSROOT"
     ldflags="-Wl,-syslibroot,$CROSS_SYSROOT "
     export BINDGEN_CFLAGS="$FLAGS"
     ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
+    # Since we are manually providing an SDK, don't check for xcode being installed.
+    # See https://bugzilla.mozilla.org/show_bug.cgi?id=1366564
+    ac_add_options --disable-xcode-checks
 else
     FLAGS=""
 fi
 
 if [ -d $TOOLTOOL_DIR ]; then
     export CC="$TOOLTOOL_DIR/clang/bin/clang $FLAGS"
     export CXX="$TOOLTOOL_DIR/clang/bin/clang++ $FLAGS"
     export CPP="$TOOLTOOL_DIR/clang/bin/clang $FLAGS -E"