corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1915778 - Clean up the clang toolchain json configs. r=firefox-build-system-reviewers,sergesanspaille

Browse Source 
By separating the "use this compiler" configuration from other items,
we avoid redundancies, and at the same time simplify how the aarch64
variants are configured by having the $os_variant.json files only
contain the `target`.

Overall, each build now only uses at most 4 configs:
- one for the compiler it uses
- one for the target (optional when the host is the same as the target)
- one for the patches applied to the clang/llvm source
- one for the build type (stage-1, profile or stage-4-pgo)

And a similar pattern for clang-tidy.

Also remove the setting for ld, which hasn't been used since bug
1799423, and ranlib and ar for builds using clang-cl, as it's not used
either.

Differential Revision: https://phabricator.services.mozilla.com/D220652
This commit is contained in:
Mike Hommey
2024-09-04 05:43:03 +00:00
parent b48661cf79
commit 9f70fdd6f4
20 changed files with 145 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/build-clang/4stages-pgo.json
View File

@@ -1,7 +0,0 @@
{
"stages": "4",
"targets": "X86;ARM;AArch64;WebAssembly",
"pgo": true,
"ranlib": "{MOZ_FETCHES_DIR}/clang/bin/llvm-ranlib",
"ar": "{MOZ_FETCHES_DIR}/clang/bin/llvm-ar"
}

11
build/build-clang/clang-tidy-external-linux64.json
View File

@@ -1,11 +0,0 @@
{
"stages": "1",
"build_clang_tidy": true,
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
"as": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"patches": [
"clang-tidy-ci.patch"
],
"build_clang_tidy_external": true
}

3
build/build-clang/clang-tidy-external.json Normal file
View File

@@ -0,0 +1,3 @@
{
"build_clang_tidy_external": true
}

10
build/build-clang/clang-tidy-linux64.json
View File

@@ -1,10 +0,0 @@
{
"stages": "1",
"build_clang_tidy": true,
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
"as": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"patches": [
"clang-tidy-ci.patch"
]
}

7
build/build-clang/clang-tidy-win64.json
View File

@@ -1,7 +0,0 @@
{
"stages": "1",
"build_clang_tidy": true,
"patches": [
"clang-tidy-ci.patch"
]
}

0
build/build-clang/clang-tidy-macosx64.json → build/build-clang/clang-tidy.json
View File

9
build/build-clang/macosx64.json
View File

@@ -1,10 +1,3 @@
{
"target": "x86_64-apple-darwin",
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
"as": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"ar": "{MOZ_FETCHES_DIR}/clang/bin/llvm-ar",
"ranlib": "{MOZ_FETCHES_DIR}/clang/bin/llvm-ranlib",
"libtool": "{MOZ_FETCHES_DIR}/clang/bin/llvm-libtool-darwin",
"ld": "{MOZ_FETCHES_DIR}/clang/bin/clang"
"target": "x86_64-apple-darwin"
}

5
build/build-clang/profile.json
View File

@@ -1,6 +1,5 @@
{
"skip_stages": "1",
"stages": "3",
"pgo": true,
"ranlib": "{MOZ_FETCHES_DIR}/clang/bin/llvm-ranlib",
"ar": "{MOZ_FETCHES_DIR}/clang/bin/llvm-ar"
"pgo": true
}

7
build/build-clang/skip-3-stages-win64.json
View File

@@ -1,7 +0,0 @@
{
"skip_stages": "3",
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang-cl",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang-cl",
"ml": "{MOZ_FETCHES_DIR}/clang/bin/clang-cl",
"lib": "{MOZ_FETCHES_DIR}/clang/bin/llvm-lib"
}

6
build/build-clang/skip-3-stages.json
View File

@@ -1,6 +0,0 @@
{
"skip_stages": "3",
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
"as": "{MOZ_FETCHES_DIR}/clang/bin/clang"
}

6
build/build-clang/skip-stage-1.json
View File

@@ -1,6 +0,0 @@
{
"skip_stages": "1",
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
"as": "{MOZ_FETCHES_DIR}/clang/bin/clang"
}

0
build/build-clang/1stage.json → build/build-clang/stage-1.json
View File

6
build/build-clang/stage-4-pgo.json Normal file
View File

@@ -0,0 +1,6 @@
{
"skip_stages": "3",
"stages": "4",
"targets": "X86;ARM;AArch64;WebAssembly",
"pgo": true
}

8
build/build-clang/use-clang-artifact.json Normal file
View File

@@ -0,0 +1,8 @@
{
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
"as": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"ar": "{MOZ_FETCHES_DIR}/clang/bin/llvm-ar",
"ranlib": "{MOZ_FETCHES_DIR}/clang/bin/llvm-ranlib",
"libtool": "{MOZ_FETCHES_DIR}/clang/bin/llvm-libtool-darwin"
}

1
build/build-clang/skip-stage-1-win64.json → build/build-clang/use-clang-cl-artifact.json
View File

@@ -1,5 +1,4 @@
{
"skip_stages": "1",
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang-cl",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang-cl",
"ml": "{MOZ_FETCHES_DIR}/clang/bin/clang-cl",

0
build/build-clang/linux64.json → build/build-clang/use-system-clang.json
View File

6
build/build-clang/win64.json
View File

@@ -1,7 +1,3 @@
{
"target": "x86_64-pc-windows-msvc",
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang-cl",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang-cl",
"ml": "{MOZ_FETCHES_DIR}/clang/bin/clang-cl",
"lib": "{MOZ_FETCHES_DIR}/clang/bin/llvm-lib"
"target": "x86_64-pc-windows-msvc"
}

42
taskcluster/kinds/toolchain/clang-tidy.yml
View File

@@ -34,9 +34,11 @@ linux64-clang-tidy:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-tidy-linux64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-tidy.json'
resources:
- 'build/build-clang/clang-tidy-linux64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-tidy.json'
fetches:
toolchain:
- linux64-clang-18
@@ -51,10 +53,12 @@ macosx64-clang-tidy:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-tidy-macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-tidy.json'
- 'build/build-clang/macosx64.json'
resources:
- 'build/build-clang/clang-tidy-macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-tidy.json'
- 'build/build-clang/macosx64.json'
fetches:
toolchain:
@@ -70,12 +74,12 @@ macosx64-aarch64-clang-tidy:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-tidy-macosx64.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-tidy.json'
- 'build/build-clang/macosx64-aarch64.json'
resources:
- 'build/build-clang/clang-tidy-macosx64.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-tidy.json'
- 'build/build-clang/macosx64-aarch64.json'
fetches:
toolchain:
@@ -93,10 +97,12 @@ win64-clang-tidy:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-tidy-win64.json'
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/clang-tidy.json'
- 'build/build-clang/win64.json'
resources:
- 'build/build-clang/clang-tidy-win64.json'
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/clang-tidy.json'
- 'build/build-clang/win64.json'
fetches:
toolchain:
@@ -115,12 +121,12 @@ win64-aarch64-clang-tidy:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-tidy-win64.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/clang-tidy.json'
- 'build/build-clang/win64-aarch64.json'
resources:
- 'build/build-clang/clang-tidy-win64.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/clang-tidy.json'
- 'build/build-clang/win64-aarch64.json'
fetches:
toolchain:
@@ -139,9 +145,13 @@ linux64-clang-tidy-external:
toolchain-artifact: project/civet/clang-tidy.tar.zst
script: build-clang-tidy-external.sh
arguments:
- 'build/build-clang/clang-tidy-external-linux64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-tidy.json'
- 'build/build-clang/clang-tidy-external.json'
resources:
- 'build/build-clang/clang-tidy-external-linux64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-tidy.json'
- 'build/build-clang/clang-tidy-external.json'
run-on-projects: []
fetches:
fetch:

206
taskcluster/kinds/toolchain/clang.yml
View File

@@ -18,11 +18,11 @@ linux64-clang-8.0-raw:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-system-clang.json'
- 'build/build-clang/clang-8.0.json'
- 'build/build-clang/2stages.json'
resources:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-system-clang.json'
- 'build/build-clang/clang-8.0.json'
- 'build/build-clang/2stages.json'
toolchain-artifact: public/build/clang.tar.zst
@@ -56,13 +56,13 @@ linux64-clang-14-stage1:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-system-clang.json'
- 'build/build-clang/clang-14.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
resources:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-system-clang.json'
- 'build/build-clang/clang-14.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -96,13 +96,15 @@ macosx64-clang-14-raw:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-14.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
resources:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-14.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -170,13 +172,13 @@ linux64-clang-18-stage1:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-system-clang.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
resources:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-system-clang.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
toolchain-alias:
by-project:
toolchains: null
@@ -196,14 +198,12 @@ linux64-clang-18-profile:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-stage-1.json'
- 'build/build-clang/profile.json'
resources:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-stage-1.json'
- 'build/build-clang/profile.json'
toolchain-artifact: public/build/merged.profdata
fetches:
@@ -221,15 +221,13 @@ linux64-clang-18-raw:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-3-stages.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
resources:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-3-stages.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -285,13 +283,15 @@ macosx64-clang-18-stage1:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
resources:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -311,14 +311,14 @@ macosx64-clang-18-profile:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-stage-1.json'
- 'build/build-clang/profile.json'
resources:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-stage-1.json'
- 'build/build-clang/profile.json'
toolchain-artifact: public/build/merged.profdata
fetches:
@@ -340,15 +340,15 @@ macosx64-clang-18-raw:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-3-stages.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
resources:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-3-stages.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -407,15 +407,15 @@ macosx64-aarch64-clang-18-stage1:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64-aarch64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
resources:
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64-aarch64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -435,16 +435,14 @@ macosx64-aarch64-clang-18-profile:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64-aarch64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-stage-1.json'
- 'build/build-clang/profile.json'
resources:
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64-aarch64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-stage-1.json'
- 'build/build-clang/profile.json'
toolchain-artifact: public/build/merged.profdata
fetches:
@@ -466,17 +464,15 @@ macosx64-aarch64-clang-18-raw:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64-aarch64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-3-stages.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
resources:
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64-aarch64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-3-stages.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -532,13 +528,15 @@ win64-clang-18-stage1:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
resources:
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
toolchain-alias:
by-project:
toolchains: null
@@ -562,14 +560,14 @@ win64-clang-18-profile:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-stage-1-win64.json'
- 'build/build-clang/profile.json'
resources:
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-stage-1-win64.json'
- 'build/build-clang/profile.json'
toolchain-artifact: public/build/merged.profdata
fetches:
@@ -590,16 +588,16 @@ win64-clang-18-raw:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-3-stages-win64.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
- 'build/build-clang/llvm-config.json'
resources:
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-3-stages-win64.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
- 'build/build-clang/llvm-config.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
@@ -659,17 +657,15 @@ win64-aarch64-clang-18-raw:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/win64.json'
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64-aarch64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-3-stages-win64.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
resources:
- 'build/build-clang/win64.json'
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64-aarch64.json'
- 'build/build-clang/clang-18.json'
- 'build/build-clang/skip-3-stages-win64.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -784,13 +780,13 @@ linux64-clang-trunk-stage1:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-system-clang.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
resources:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-system-clang.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
toolchain-alias:
by-project:
toolchains: linux64-clang-toolchain
@@ -812,14 +808,12 @@ linux64-clang-trunk-profile:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-stage-1.json'
- 'build/build-clang/profile.json'
resources:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-stage-1.json'
- 'build/build-clang/profile.json'
toolchain-artifact: public/build/merged.profdata
fetches:
@@ -839,15 +833,13 @@ linux64-clang-trunk-raw:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-3-stages.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
resources:
- 'build/build-clang/linux64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-3-stages.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -905,13 +897,15 @@ macosx64-clang-trunk-stage1:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
resources:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -933,14 +927,14 @@ macosx64-clang-trunk-profile:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-stage-1.json'
- 'build/build-clang/profile.json'
resources:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-stage-1.json'
- 'build/build-clang/profile.json'
toolchain-artifact: public/build/merged.profdata
fetches:
@@ -964,15 +958,15 @@ macosx64-clang-trunk-raw:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-3-stages.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
resources:
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-3-stages.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -1033,15 +1027,15 @@ macosx64-aarch64-clang-trunk-stage1:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64-aarch64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
resources:
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64-aarch64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -1063,16 +1057,14 @@ macosx64-aarch64-clang-trunk-profile:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64-aarch64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-stage-1.json'
- 'build/build-clang/profile.json'
resources:
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64-aarch64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-stage-1.json'
- 'build/build-clang/profile.json'
toolchain-artifact: public/build/merged.profdata
fetches:
@@ -1096,17 +1088,15 @@ macosx64-aarch64-clang-trunk-raw:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64-aarch64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-3-stages.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
resources:
- 'build/build-clang/macosx64.json'
- 'build/build-clang/use-clang-artifact.json'
- 'build/build-clang/macosx64-aarch64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-3-stages.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -1164,13 +1154,15 @@ win64-clang-trunk-stage1:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
resources:
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/1stage.json'
- 'build/build-clang/stage-1.json'
toolchain-alias:
by-project:
toolchains: win64-clang-toolchain
@@ -1196,14 +1188,14 @@ win64-clang-trunk-profile:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-stage-1-win64.json'
- 'build/build-clang/profile.json'
resources:
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-stage-1-win64.json'
- 'build/build-clang/profile.json'
toolchain-artifact: public/build/merged.profdata
fetches:
@@ -1226,15 +1218,15 @@ win64-clang-trunk-raw:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-3-stages-win64.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
resources:
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-3-stages-win64.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -1295,17 +1287,15 @@ win64-aarch64-clang-trunk-raw:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/win64.json'
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64-aarch64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-3-stages-win64.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
resources:
- 'build/build-clang/win64.json'
- 'build/build-clang/use-clang-cl-artifact.json'
- 'build/build-clang/win64-aarch64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/skip-3-stages-win64.json'
- 'build/build-clang/4stages-pgo.json'
- 'build/build-clang/stage-4-pgo.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:

6
taskcluster/scripts/misc/build-clang.sh
View File

@@ -44,12 +44,6 @@ case "$CONFIGS" in
;;
esac
;;
*linux64*|*android*)
;;
*)
echo Cannot figure out build configuration for $CONFIGS
exit 1
;;
esac
if test -d "$MOZ_FETCHES_DIR/cmake"; then