Bug 1283898 - Don't set RUSTC for artifact builds. r?mshal
The --disable-compile-environment configure option used by
the artifact builds removes all support for toolchains,
including setting paths for them with environment options.
Unset the RUSTC and CARGO vars inherited from mozconfig.rust
in the artifact mozconfigs to accommodate the invalid option
check, just like we do for the CC and CXX options.
MozReview-Commit-ID: IwPetRaIY25
--- a/browser/config/mozconfigs/linux32/artifact
+++ b/browser/config/mozconfigs/linux32/artifact
@@ -3,8 +3,10 @@ MOZ_AUTOMATION_L10N_CHECK=0
. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
. "$topsrcdir/build/mozconfig.common.override"
ac_add_options --enable-artifact-builds
ac_add_options --enable-artifact-build-symbols
unset CC
unset CXX
+unset RUSTC
+unset CARGO
--- a/browser/config/mozconfigs/linux32/debug-artifact
+++ b/browser/config/mozconfigs/linux32/debug-artifact
@@ -3,10 +3,12 @@ MOZ_AUTOMATION_L10N_CHECK=0
. "$topsrcdir/build/unix/mozconfig.linux32"
. "$topsrcdir/build/mozconfig.common.override"
ac_add_options --enable-artifact-builds
ac_add_options --enable-artifact-build-symbols
unset CC
unset CXX
+unset RUSTC
+unset CARGO
ac_add_options --enable-debug
--- a/browser/config/mozconfigs/linux64/artifact
+++ b/browser/config/mozconfigs/linux64/artifact
@@ -3,8 +3,10 @@ MOZ_AUTOMATION_L10N_CHECK=0
. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
. "$topsrcdir/build/mozconfig.common.override"
ac_add_options --enable-artifact-builds
ac_add_options --enable-artifact-build-symbols
unset CC
unset CXX
+unset RUSTC
+unset CARGO
--- a/browser/config/mozconfigs/linux64/debug-artifact
+++ b/browser/config/mozconfigs/linux64/debug-artifact
@@ -3,11 +3,13 @@ MOZ_AUTOMATION_L10N_CHECK=0
. "$topsrcdir/build/unix/mozconfig.linux"
. "$topsrcdir/build/mozconfig.common.override"
ac_add_options --enable-artifact-builds
ac_add_options --enable-artifact-build-symbols
unset CC
unset CXX
+unset RUSTC
+unset CARGO
ac_add_options --enable-debug
--- a/browser/config/mozconfigs/macosx64/artifact
+++ b/browser/config/mozconfigs/macosx64/artifact
@@ -6,8 +6,10 @@ export MOZILLA_OFFICIAL=1
. "$topsrcdir/build/macosx/mozconfig.common"
. "$topsrcdir/build/mozconfig.common.override"
ac_add_options --enable-artifact-builds
ac_add_options --enable-artifact-build-symbols
unset CC
unset CXX
+unset RUSTC
+unset CARGO
--- a/browser/config/mozconfigs/macosx64/debug-artifact
+++ b/browser/config/mozconfigs/macosx64/debug-artifact
@@ -3,10 +3,12 @@ MOZ_AUTOMATION_L10N_CHECK=0
. "$topsrcdir/build/macosx/mozconfig.common"
. "$topsrcdir/build/mozconfig.common.override"
ac_add_options --enable-artifact-builds
ac_add_options --enable-artifact-build-symbols
unset CC
unset CXX
+unset RUSTC
+unset CARGO
ac_add_options --enable-debug
--- a/mobile/android/config/mozconfigs/android-api-15-frontend/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15-frontend/nightly
@@ -14,16 +14,18 @@ NO_NDK=1
. "$topsrcdir/mobile/android/config/mozconfigs/common"
ac_add_options --with-gradle="$topsrcdir/gradle-dist/bin/gradle"
export GRADLE_MAVEN_REPOSITORY="file://$topsrcdir/jcentral"
unset HOST_CC
unset HOST_CXX
+unset RUSTC
+unset CARGO
ac_add_options --disable-compile-environment
ac_add_options --disable-tests
# From here on, like ../android-api-15/nightly.
ac_add_options --enable-profiling
--- a/mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly
@@ -19,16 +19,18 @@ ac_add_options --with-gradle
# We want to use (and populate!) the local Nexus repository.
export GRADLE_MAVEN_REPOSITORY="http://localhost:8081/nexus/content/repositories/central/"
# From here on, just like ../android-api-15-frontend/nightly.
ac_add_options --disable-compile-environment
unset HOST_CC
unset HOST_CXX
+unset RUSTC
+unset CARGO
ac_add_options --disable-tests
ac_add_options --enable-profiling
# Android
ac_add_options --with-android-min-sdk=15
ac_add_options --target=arm-linux-androideabi
--- a/mobile/android/config/mozconfigs/android-api-15-gradle/nightly-artifact
+++ b/mobile/android/config/mozconfigs/android-api-15-gradle/nightly-artifact
@@ -7,12 +7,14 @@ NO_NDK=1
. "$topsrcdir/mobile/android/config/mozconfigs/common"
. "$topsrcdir/mobile/android/config/mozconfigs/android-api-15-gradle/nightly"
unset CC
unset CXX
unset HOST_CC
unset HOST_CXX
+unset RUSTC
+unset CARGO
ac_add_options --enable-artifact-builds
. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-15/debug-artifact
+++ b/mobile/android/config/mozconfigs/android-api-15/debug-artifact
@@ -11,12 +11,14 @@ ac_add_options --enable-debug
ENABLE_MARIONETTE=1
. "$topsrcdir/mobile/android/config/mozconfigs/android-api-15/nightly"
unset CC
unset CXX
unset HOST_CC
unset HOST_CXX
+unset RUSTC
+unset CARGO
ac_add_options --enable-artifact-builds
. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-15/nightly-artifact
+++ b/mobile/android/config/mozconfigs/android-api-15/nightly-artifact
@@ -7,12 +7,14 @@ NO_NDK=1
. "$topsrcdir/mobile/android/config/mozconfigs/common"
. "$topsrcdir/mobile/android/config/mozconfigs/android-api-15/nightly"
unset CC
unset CXX
unset HOST_CC
unset HOST_CXX
+unset RUSTC
+unset CARGO
ac_add_options --enable-artifact-builds
. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/nightly-artifact
+++ b/mobile/android/config/mozconfigs/android-x86/nightly-artifact
@@ -7,12 +7,14 @@ NO_NDK=1
. "$topsrcdir/mobile/android/config/mozconfigs/common"
. "$topsrcdir/mobile/android/config/mozconfigs/android-x86/nightly"
unset CC
unset CXX
unset HOST_CC
unset HOST_CXX
+unset RUSTC
+unset CARGO
ac_add_options --enable-artifact-builds
. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
