mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 07:13:20 +00:00
Bug 1300380 - Fix autospider on osx. r=terrence
This commit is contained in:
parent
5f508aae61
commit
6e42b2314d
@ -179,6 +179,7 @@ else:
|
||||
env.setdefault('CXX', cxx)
|
||||
|
||||
if platform.system() == 'Darwin':
|
||||
os.environ['SOURCE'] = DIR.source
|
||||
set_vars_from_script(os.path.join(DIR.scripts, 'macbuildenv.sh'),
|
||||
['CC', 'CXX'])
|
||||
elif platform.system() == 'Windows':
|
||||
|
@ -10,18 +10,5 @@ ac_add_options() {
|
||||
|
||||
topsrcdir="$SOURCE"
|
||||
|
||||
if [ -n "$AUTOMATION" ]; then
|
||||
# Download clang and some other things from tooltool server.
|
||||
# This should be done before running mozconfig to make clang detection
|
||||
# there work properly.
|
||||
TT_SERVER=${TT_SERVER:-https://api.pub.build.mozilla.org/tooltool/}
|
||||
( cd $SOURCE/..; \
|
||||
./scripts/scripts/tooltool/tooltool_wrapper.sh \
|
||||
$SOURCE/browser/config/tooltool-manifests/macosx64/releng.manifest \
|
||||
$TT_SERVER \
|
||||
setup.sh \
|
||||
$TOOLTOOL_HOME/tooltool.py )
|
||||
fi
|
||||
|
||||
# Setup CC and CXX variables
|
||||
. $topsrcdir/build/macosx/mozconfig.common
|
||||
|
Loading…
Reference in New Issue
Block a user