From fba3b82d24b13ba2d7a86cfbf6883d73a271b3f4 Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Sat, 22 Jul 2017 13:02:23 -0600 Subject: [PATCH] Bug 1383394 - Unset LLVM_CONFIG when disabling stylo for OSX builds; rs?bustage-fix MozReview-Commit-ID: 8rJIvOwgdZP --HG-- extra : rebase_source : a945c55b2fc52be2f4a8f9e3f9c60000cf294f35 --- mail/config/mozconfigs/macosx64/debug | 2 ++ mail/config/mozconfigs/macosx64/l10n-mozconfig | 2 ++ mail/config/mozconfigs/macosx64/nightly | 2 ++ mail/config/mozconfigs/macosx64/release | 2 ++ 4 files changed, 8 insertions(+) diff --git a/mail/config/mozconfigs/macosx64/debug b/mail/config/mozconfigs/macosx64/debug index 7067c1c7d0..2ac7d2e3e9 100644 --- a/mail/config/mozconfigs/macosx64/debug +++ b/mail/config/mozconfigs/macosx64/debug @@ -30,3 +30,5 @@ ac_add_options RUSTFLAGS='-C debuginfo=1' # Disable stylo. # https://bugzilla.mozilla.org/show_bug.cgi?id=1380171 ac_add_options --disable-stylo + +unset LLVM_CONFIG diff --git a/mail/config/mozconfigs/macosx64/l10n-mozconfig b/mail/config/mozconfigs/macosx64/l10n-mozconfig index 5b4693bdbc..3745e49525 100644 --- a/mail/config/mozconfigs/macosx64/l10n-mozconfig +++ b/mail/config/mozconfigs/macosx64/l10n-mozconfig @@ -24,3 +24,5 @@ ac_add_options RUSTFLAGS='-C debuginfo=1' # Disable stylo. # https://bugzilla.mozilla.org/show_bug.cgi?id=1380171 ac_add_options --disable-stylo + +unset LLVM_CONFIG diff --git a/mail/config/mozconfigs/macosx64/nightly b/mail/config/mozconfigs/macosx64/nightly index 33c421fcb7..88c92c3db8 100644 --- a/mail/config/mozconfigs/macosx64/nightly +++ b/mail/config/mozconfigs/macosx64/nightly @@ -43,3 +43,5 @@ ac_add_options RUSTFLAGS='-C debuginfo=1' # Disable stylo. # https://bugzilla.mozilla.org/show_bug.cgi?id=1380171 ac_add_options --disable-stylo + +unset LLVM_CONFIG diff --git a/mail/config/mozconfigs/macosx64/release b/mail/config/mozconfigs/macosx64/release index e41fc8738c..70808e1fde 100644 --- a/mail/config/mozconfigs/macosx64/release +++ b/mail/config/mozconfigs/macosx64/release @@ -40,3 +40,5 @@ ac_add_options RUSTFLAGS='-C debuginfo=1' # Disable stylo. # https://bugzilla.mozilla.org/show_bug.cgi?id=1380171 ac_add_options --disable-stylo + +unset LLVM_CONFIG