mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1538060 - Update non-Windows builds to clang 8. r=froydnj 

Windows builds have been taken care of in bug 1535441.

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

--HG--
rename : build/build-clang/clang-7-android.json => build/build-clang/clang-8-android.json
rename : build/build-clang/clang-7-linux64.json => build/build-clang/clang-8-linux64.json
rename : build/build-clang/clang-7-macosx64.json => build/build-clang/clang-8-macosx64.json
rename : build/build-clang/clang-trunk-mingw.json => build/build-clang/clang-8-mingw.json
rename : taskcluster/scripts/misc/build-clang-7-android.sh => taskcluster/scripts/misc/build-clang-8-android.sh
rename : taskcluster/scripts/misc/build-clang-7-linux-macosx-cross.sh => taskcluster/scripts/misc/build-clang-8-linux-macosx-cross.sh
rename : taskcluster/scripts/misc/build-clang-7-linux.sh => taskcluster/scripts/misc/build-clang-8-linux.sh
rename : taskcluster/scripts/misc/build-clang-trunk-mingw.sh => taskcluster/scripts/misc/build-clang-8-mingw.sh
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2019-04-02 02:18:10 +00:00
Родитель e64563ea54
Коммит 9454edbe38
26 изменённых файлов: 92 добавлений и 94 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
browser/config/mozconfigs/linux64/code-coverage
Просмотреть файл

@ -12,6 +12,6 @@ ac_add_options --disable-profiling
ac_add_options --disable-warnings-as-errors
ac_add_options --enable-coverage
export LDFLAGS="--coverage -L$topsrcdir/clang/lib/clang/7.0.1/lib/linux/"
export LDFLAGS="--coverage -L$topsrcdir/clang/lib/clang/8.0.0/lib/linux/"
export LIBS="-lclang_rt.profile-x86_64"
export RUSTFLAGS="-Ccodegen-units=1 -Zprofile -Zno-landing-pads -Clink-dead-code -Coverflow-checks=off"

2
browser/config/mozconfigs/macosx64/code-coverage
Просмотреть файл

@ -8,6 +8,6 @@ ac_add_options --disable-sandbox
ac_add_options --disable-warnings-as-errors
ac_add_options --enable-coverage
export LDFLAGS="-coverage -L$topsrcdir/clang/lib/clang/7.0.1/lib/darwin/"
export LDFLAGS="-coverage -L$topsrcdir/clang/lib/clang/8.0.0/lib/darwin/"
export LIBS="-lclang_rt.profile_osx"
export RUSTFLAGS="-Ccodegen-units=1 -Zprofile -Zno-landing-pads -Clink-dead-code -Coverflow-checks=off"

17
build/build-clang/clang-7-android.json → build/build-clang/clang-8-android.json
Просмотреть файл

@ -1,15 +1,15 @@
{
"llvm_revision": "349247",
"llvm_revision": "356365",
"stages": "2",
"build_libcxx": true,
"build_type": "Release",
"assertions": false,
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_701/final",
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_701/final",
"lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_701/final",
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_701/final",
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_701/final",
"libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_701/final",
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_800/final",
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_800/final",
"lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_800/final",
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_800/final",
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_800/final",
"libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_800/final",
"python_path": "/usr/bin/python2.7",
"gcc_dir": "/builds/worker/workspace/build/src/gcc",
"cc": "/builds/worker/workspace/build/src/gcc/bin/gcc",
@ -47,7 +47,6 @@
"patches": [
"static-llvm-symbolizer.patch",
"find_symbolizer_linux.patch",
"rename_gcov_flush_.patch",
"r350774.patch"
"rename_gcov_flush_.patch"
]
}

15
build/build-clang/clang-7-linux64.json → build/build-clang/clang-8-linux64.json
Просмотреть файл

@ -1,15 +1,15 @@
{
"llvm_revision": "349247",
"llvm_revision": "356365",
"stages": "3",
"build_libcxx": true,
"build_type": "Release",
"assertions": false,
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_701/final",
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_701/final",
"lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_701/final",
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_701/final",
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_701/final",
"libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_701/final",
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_800/final",
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_800/final",
"lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_800/final",
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_800/final",
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_800/final",
"libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_800/final",
"python_path": "/usr/bin/python2.7",
"gcc_dir": "/builds/worker/workspace/build/src/gcc",
"cc": "/builds/worker/workspace/build/src/gcc/bin/gcc",
@ -19,7 +19,6 @@
"static-llvm-symbolizer.patch",
"find_symbolizer_linux.patch",
"rename_gcov_flush_.patch",
"r350774.patch",
"android-mangling-error.patch"
]
}

17
build/build-clang/clang-7-macosx64.json → build/build-clang/clang-8-macosx64.json
Просмотреть файл

@ -1,16 +1,16 @@
{
"llvm_revision": "349247",
"llvm_revision": "356365",
"stages": "1",
"build_libcxx": true,
"build_type": "Release",
"assertions": false,
"osx_cross_compile": true,
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_701/final",
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_701/final",
"lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_701/final",
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_701/final",
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_701/final",
"libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_701/final",
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_800/final",
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_800/final",
"lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_800/final",
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_800/final",
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_800/final",
"libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_800/final",
"python_path": "/usr/bin/python2.7",
"gcc_dir": "/builds/worker/workspace/build/src/gcc",
"cc": "/builds/worker/workspace/build/src/clang/bin/clang",
@ -23,7 +23,6 @@
"patches": [
"static-llvm-symbolizer.patch",
"compiler-rt-cross-compile.patch",
"compiler-rt-no-codesign.patch",
"r350774.patch"
"compiler-rt-no-codesign.patch"
]
}

1
build/build-clang/clang-trunk-mingw.json → build/build-clang/clang-8-mingw.json
Просмотреть файл

@ -16,6 +16,5 @@
"cxx": "/builds/worker/workspace/build/src/gcc/bin/g++",
"as": "/builds/worker/workspace/build/src/gcc/bin/gcc",
"patches": [
"r350774.patch"
]
}

14
build/build-clang/r350774.patch
Просмотреть файл

@ -1,14 +0,0 @@
diff --git a/llvm/lib/Object/Binary.cpp b/llvm/lib/Object/Binary.cpp
index d7c25921ec3..fe41987f5c2 100644
--- a/llvm/lib/Object/Binary.cpp
+++ b/llvm/lib/Object/Binary.cpp
@@ -88,7 +88,8 @@ Expected<std::unique_ptr<Binary>> object::createBinary(MemoryBufferRef Buffer,
Expected<OwningBinary<Binary>> object::createBinary(StringRef Path) {
ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr =
- MemoryBuffer::getFileOrSTDIN(Path);
+ MemoryBuffer::getFileOrSTDIN(Path, /*FileSize=*/-1,
+ /*RequiresNullTerminator=*/false);
if (std::error_code EC = FileOrErr.getError())
return errorCodeToError(EC);
std::unique_ptr<MemoryBuffer> &Buffer = FileOrErr.get();

13
build/build-clang/rename_gcov_flush_.patch
Просмотреть файл

@ -12,3 +12,16 @@ diff --git a/compiler-rt/lib/profile/GCDAProfiling.c b/compiler-rt/lib/profile/G
struct fn_node* curr = flush_fn_list.head;
while (curr) {
diff --git a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
index 9af64ed332c..bcebe303ff4 100644
--- a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
+++ b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
@@ -648,7 +648,7 @@ void GCOVProfiler::AddFlushBeforeForkAndExec() {
for (auto I : ForkAndExecs) {
IRBuilder<> Builder(I);
FunctionType *FTy = FunctionType::get(Builder.getVoidTy(), {}, false);
- Constant *GCOVFlush = M->getOrInsertFunction("__gcov_flush", FTy);
+ Constant *GCOVFlush = M->getOrInsertFunction("__custom_llvm_gcov_flush", FTy);
Builder.CreateCall(GCOVFlush);
I->getParent()->splitBasicBlock(I);
}

5
build/clang-plugin/moz.build
Просмотреть файл

@ -70,6 +70,11 @@ HOST_COMPILE_FLAGS['VISIBILITY'] = []
if CONFIG['HOST_OS_ARCH'] == 'Darwin':
HOST_CXXFLAGS += ['-stdlib=libc++']
# As of clang 8, llvm-config doesn't output the flags used to build clang
# itself, so we don't end up with -fPIC as a side effect. llvm.org/PR8220
if CONFIG['HOST_OS_ARCH'] != 'Windows':
HOST_CXXFLAGS += ['-fPIC']
DIRS += [
'tests',
]

4
taskcluster/ci/build/linux.yml
Просмотреть файл

@ -1018,7 +1018,7 @@ linux64-ccov/debug:
tooltool-downloads: public
need-xvfb: true
toolchains:
- linux64-clang-7
- linux64-clang-8
- linux64-rust-nightly
- linux64-gcc
- linux64-cbindgen
@ -1057,7 +1057,7 @@ linux64-ccov/opt:
tooltool-downloads: public
need-xvfb: true
toolchains:
- linux64-clang-7
- linux64-clang-8
- linux64-rust-nightly
- linux64-gcc
- linux64-cbindgen

8
taskcluster/ci/build/windows.yml
Просмотреть файл

@ -1179,7 +1179,7 @@ win32-mingwclang/opt:
- linux64-cbindgen
- linux64-nasm
- linux64-node
- linux64-clang-trunk-mingw-x86
- linux64-clang-mingw-x86
- linux64-mingw32-nsis
- linux64-mingw-fxc2-x86
@ -1215,7 +1215,7 @@ win32-mingwclang/debug:
- linux64-cbindgen
- linux64-nasm
- linux64-node
- linux64-clang-trunk-mingw-x86
- linux64-clang-mingw-x86
- linux64-mingw32-nsis
- linux64-mingw-fxc2-x86
@ -1251,7 +1251,7 @@ win64-mingwclang/opt:
- linux64-cbindgen
- linux64-nasm
- linux64-node
- linux64-clang-trunk-mingw-x64
- linux64-clang-mingw-x64
- linux64-mingw32-nsis
- linux64-mingw-fxc2-x86
@ -1287,6 +1287,6 @@ win64-mingwclang/debug:
- linux64-cbindgen
- linux64-nasm
- linux64-node
- linux64-clang-trunk-mingw-x64
- linux64-clang-mingw-x64
- linux64-mingw32-nsis
- linux64-mingw-fxc2-x86

2
taskcluster/ci/instrumented-build/kind.yml
Просмотреть файл

@ -93,7 +93,7 @@ jobs:
- android-gradle-dependencies
- android-ndk-linux
- android-sdk-linux
- linux64-clang-7-android-cross
- linux64-clang-android-cross
- linux64-rust-android
- linux64-rust-size
- linux64-cbindgen

2
taskcluster/ci/toolchain/cbindgen.yml
Просмотреть файл

@ -37,7 +37,7 @@ macosx64-cbindgen:
tooltool-downloads: internal
toolchains:
- linux64-cctools-port
- linux64-clang-7
- linux64-clang-8
- linux64-llvm-dsymutil
- linux64-rust-macos-1.32

4
taskcluster/ci/toolchain/cctools-port.yml
Просмотреть файл

@ -18,7 +18,7 @@ linux64-cctools-port:
script: build-cctools-port.sh
toolchain-artifact: public/build/cctools.tar.xz
toolchains:
- linux64-clang-7
- linux64-clang-8
macosx64-cctools-port:
description: "cctools-port toolchain build"
@ -36,5 +36,5 @@ macosx64-cctools-port:
toolchain-artifact: public/build/cctools.tar.bz2
toolchains:
- linux64-cctools-port
- linux64-clang-7
- linux64-clang-8
- linux64-node

2
taskcluster/ci/toolchain/clang-tidy.yml
Просмотреть файл

@ -54,7 +54,7 @@ macosx64-clang-tidy:
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchains:
- linux64-cctools-port
- linux64-clang-7
- linux64-clang-8
- linux64-gcc-6
- linux64-node

50
taskcluster/ci/toolchain/clang.yml
Просмотреть файл

@ -24,64 +24,66 @@ linux64-clang-4.0:
toolchains:
- linux64-gcc-6
linux64-clang-7:
description: "Clang 7 toolchain build"
linux64-clang-8:
description: "Clang 8 toolchain build"
treeherder:
symbol: TL(clang7)
symbol: TL(clang8)
run:
using: toolchain-script
script: build-clang-7-linux.sh
script: build-clang-8-linux.sh
resources:
- 'build/build-clang/build-clang.py'
- 'build/build-clang/clang-7-linux64.json'
- 'build/build-clang/clang-8-linux64.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: linux64-clang
toolchain-artifact: public/build/clang.tar.xz
toolchains:
- linux64-gcc-6
linux64-clang-trunk-mingw-x86:
linux64-clang-8-mingw-x86:
description: "MinGW-Clang Trunk x86 toolchain build"
treeherder:
symbol: TMW(clang-x86)
run:
script: build-clang-trunk-mingw.sh
script: build-clang-8-mingw.sh
arguments: [
'x86'
]
resources:
- 'build/build-clang/clang-trunk-mingw.json'
- 'build/build-clang/clang-8-mingw.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: linux64-clang-mingw-x86
toolchain-artifact: public/build/clangmingw.tar.xz
toolchains:
- linux64-gcc-6
linux64-clang-trunk-mingw-x64:
linux64-clang-8-mingw-x64:
description: "MinGW-Clang Trunk x64 toolchain build"
treeherder:
symbol: TMW(clang-x64)
tier: 1
run:
script: build-clang-trunk-mingw.sh
script: build-clang-8-mingw.sh
arguments: [
'x64'
]
resources:
- 'build/build-clang/clang-trunk-mingw.json'
- 'build/build-clang/clang-8-mingw.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: linux64-clang-mingw-x64
toolchain-artifact: public/build/clangmingw.tar.xz
toolchains:
- linux64-gcc-6
linux64-clang-7-android-cross:
description: "Clang 7 toolchain build"
linux64-clang-8-android-cross:
description: "Clang 8 toolchain build"
treeherder:
symbol: TL(clang7-android)
symbol: TL(clang8-android)
run:
using: toolchain-script
script: build-clang-7-android.sh
script: build-clang-8-android.sh
resources:
- 'build/build-clang/clang-7-android.json'
- 'build/build-clang/clang-8-android.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: linux64-clang-android-cross
toolchain-artifact: public/build/clang.tar.xz
@ -89,26 +91,26 @@ linux64-clang-7-android-cross:
- linux64-gcc-6
- linux64-android-ndk-linux-repack
linux64-clang-7-macosx-cross:
description: "Clang 7 toolchain build with MacOS Compiler RT libs"
linux64-clang-8-macosx-cross:
description: "Clang 8 toolchain build with MacOS Compiler RT libs"
treeherder:
symbol: TL(clang7-macosx-cross)
symbol: TL(clang8-macosx-cross)
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 3600
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
run:
script: build-clang-7-linux-macosx-cross.sh
script: build-clang-8-linux-macosx-cross.sh
resources:
- 'build/build-clang/clang-7-macosx64.json'
- 'build/build-clang/clang-8-macosx64.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: linux64-clang-macosx-cross
toolchain-artifact: public/build/clang.tar.xz
tooltool-downloads: internal
toolchains:
- linux64-cctools-port
- linux64-clang-7
- linux64-clang-8
- linux64-gcc-6
macosx64-clang:
@ -127,12 +129,12 @@ macosx64-clang:
script: build-clang-macosx.sh
tooltool-downloads: internal
resources:
- 'build/build-clang/clang-7-macosx64.json'
- 'build/build-clang/clang-8-macosx64.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-artifact: public/build/clang.tar.xz
toolchains:
- linux64-cctools-port
- linux64-clang-7
- linux64-clang-8
- linux64-gcc-6
- linux64-node

2
taskcluster/ci/toolchain/gn.yml
Просмотреть файл

@ -36,7 +36,7 @@ macosx64-gn:
tooltool-downloads: internal
toolchains:
- linux64-cctools-port
- linux64-clang-7
- linux64-clang-8
- linux64-node
win32-gn:

6
taskcluster/ci/toolchain/mingw.yml
Просмотреть файл

@ -77,10 +77,6 @@ linux64-mingw-fxc2-x86:
run:
using: toolchain-script
script: build-mingw-fxc2-x86.sh
resources:
- 'build/build-clang/build-clang.py'
- 'build/build-clang/clang-trunk-mingw.json'
- 'taskcluster/scripts/misc/build-clang-trunk-mingw.sh'
toolchain-artifact: public/build/fxc2.tar.xz
toolchains:
- linux64-clang-trunk-mingw-x86
- linux64-clang-8-mingw-x86

6
taskcluster/ci/toolchain/minidump_stackwalk.yml
Просмотреть файл

@ -21,7 +21,7 @@ linux64-minidump-stackwalk:
treeherder:
symbol: TL(stackwalk)
toolchains:
- linux64-clang-7
- linux64-clang-8
- linux64-binutils
- linux64-rust-1.31
@ -36,7 +36,7 @@ macosx64-minidump-stackwalk:
tooltool-downloads: internal
toolchains:
- linux64-cctools-port
- linux64-clang-7
- linux64-clang-8
- linux64-rust-macos-1.31
win32-minidump-stackwalk:
@ -47,5 +47,5 @@ win32-minidump-stackwalk:
run:
arguments: ['mingw32']
toolchains:
- linux64-clang-trunk-mingw-x86
- linux64-clang-8-mingw-x86
- mingw32-rust-1.31

2
taskcluster/ci/toolchain/misc.yml
Просмотреть файл

@ -60,7 +60,7 @@ linux64-hfsplus:
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-artifact: public/build/hfsplus-tools.tar.xz
toolchains:
- linux64-clang-7
- linux64-clang-8
linux64-libdmg:
description: "libdmg-hfsplus toolchain build"

2
taskcluster/ci/toolchain/nasm.yml
Просмотреть файл

@ -21,7 +21,7 @@ win64-nasm:
script: build-nasm.sh
arguments: ['win64']
toolchains:
- linux64-clang-trunk-mingw-x64
- linux64-clang-8-mingw-x64
fetches:
fetch:
- nasm-2.14.02

2
taskcluster/scripts/misc/build-clang-7-android.sh → taskcluster/scripts/misc/build-clang-8-android.sh
Просмотреть файл

@ -17,7 +17,7 @@ set +x
cd build/build-clang
# |mach python| sets up a virtualenv for us!
../../mach python ./build-clang.py -c clang-7-android.json
../../mach python ./build-clang.py -c clang-8-android.json
set -x

2
taskcluster/scripts/misc/build-clang-7-linux-macosx-cross.sh → taskcluster/scripts/misc/build-clang-8-linux-macosx-cross.sh
Просмотреть файл

@ -23,7 +23,7 @@ set +x
cd build/build-clang
# |mach python| sets up a virtualenv for us!
../../mach python ./build-clang.py -c clang-7-macosx64.json --skip-tar
../../mach python ./build-clang.py -c clang-8-macosx64.json --skip-tar
# We now have a native macosx64 toolchain.
# What we want is a native linux64 toolchain which can target macosx64 and use the sanitizer dylibs.

2
taskcluster/scripts/misc/build-clang-7-linux.sh → taskcluster/scripts/misc/build-clang-8-linux.sh
Просмотреть файл

@ -16,7 +16,7 @@ set +x
cd build/build-clang
# |mach python| sets up a virtualenv for us!
../../mach python ./build-clang.py -c clang-7-linux64.json
../../mach python ./build-clang.py -c clang-8-linux64.json
set -x

2
taskcluster/scripts/misc/build-clang-trunk-mingw.sh → taskcluster/scripts/misc/build-clang-8-mingw.sh
Просмотреть файл

@ -304,7 +304,7 @@ set +x
cd build/build-clang
# |mach python| sets up a virtualenv for us!
../../mach python ./build-clang.py -c clang-trunk-mingw.json --skip-tar
../../mach python ./build-clang.py -c clang-8-mingw.json --skip-tar
set -x

2
taskcluster/scripts/misc/build-clang-macosx.sh
Просмотреть файл

@ -22,7 +22,7 @@ set +x
cd build/build-clang
# |mach python| sets up a virtualenv for us!
../../mach python ./build-clang.py -c clang-7-macosx64.json
../../mach python ./build-clang.py -c clang-8-macosx64.json
set -x