Bug 1515604 - Fix artifact builds after bug 1513798. r=nalexander

Differential Revision: https://phabricator.services.mozilla.com/D15079

--HG--
extra : moz-landing-system : lando

build/macosx/cross-mozconfig.common

@@ -36,8 +36,8 @@ export HOST_CXXFLAGS="-g"
 export HOST_LDFLAGS="-g"
 
 ac_add_options --target=x86_64-apple-darwin11
-ac_add_options --with-macos-sdk=$CROSS_SYSROOT
-ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
+export MACOS_SDK_DIR=$CROSS_SYSROOT
+export MACOS_PRIVATE_FRAMEWORKS_DIR=$CROSS_PRIVATE_FRAMEWORKS
 
 if [ "x$MOZ_PKG_SPECIAL" != "xasan" -a -z "$MOZ_AUTOMATION_ARTIFACT_BUILDS" ]; then
   # Enable static analysis checks by default on OSX cross builds.

build/moz.configure/toolchain.configure

@@ -222,7 +222,8 @@ with only_when(target_is_osx):
     # MacOS SDK
     # =========
 
-    option('--with-macos-sdk', nargs=1, help='Location of platform SDK to use')
+    option('--with-macos-sdk', env='MACOS_SDK_DIR', nargs=1,
+           help='Location of platform SDK to use')
 
     @depends_if('--with-macos-sdk')
     @imports(_from='os.path', _import='isdir')
@@ -237,7 +238,8 @@ with only_when(target_is_osx):
     set_config('MACOS_SDK_DIR', macos_sdk)
 
     with only_when(cross_compiling):
-        option('--with-macos-private-frameworks', nargs=1,
+        option('--with-macos-private-frameworks',
+               env="MACOS_PRIVATE_FRAMEWORKS_DIR", nargs=1,
                help='Location of private frameworks to use')
 
         @depends_if('--with-macos-private-frameworks')

build/mozconfig.no-compile

@@ -25,6 +25,8 @@ unset LLVM_PROFDATA
 unset WIN64_LINK
 unset WIN64_LIB
 unset ENABLE_CLANG_PLUGIN
+unset MACOS_SDK_DIR
+unset MACOS_PRIVATE_FRAMEWORKS_DIR
 
 unset MOZ_STDCXX_COMPAT
 unset MOZ_NO_PIE_COMPAT