diff --git a/build/build-clang/4stages-pgo.json b/build/build-clang/4stages-pgo.json deleted file mode 100644 index 8f0c5aa97d71..000000000000 --- a/build/build-clang/4stages-pgo.json +++ /dev/null @@ -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" -} diff --git a/build/build-clang/clang-tidy-external-linux64.json b/build/build-clang/clang-tidy-external-linux64.json deleted file mode 100644 index 897911d3e303..000000000000 --- a/build/build-clang/clang-tidy-external-linux64.json +++ /dev/null @@ -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 -} diff --git a/build/build-clang/clang-tidy-external.json b/build/build-clang/clang-tidy-external.json new file mode 100644 index 000000000000..61120f3e6f15 --- /dev/null +++ b/build/build-clang/clang-tidy-external.json @@ -0,0 +1,3 @@ +{ + "build_clang_tidy_external": true +} diff --git a/build/build-clang/clang-tidy-linux64.json b/build/build-clang/clang-tidy-linux64.json deleted file mode 100644 index e654aeef92e2..000000000000 --- a/build/build-clang/clang-tidy-linux64.json +++ /dev/null @@ -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" - ] -} diff --git a/build/build-clang/clang-tidy-win64.json b/build/build-clang/clang-tidy-win64.json deleted file mode 100644 index 6da85803f59c..000000000000 --- a/build/build-clang/clang-tidy-win64.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "stages": "1", - "build_clang_tidy": true, - "patches": [ - "clang-tidy-ci.patch" - ] -} diff --git a/build/build-clang/clang-tidy-macosx64.json b/build/build-clang/clang-tidy.json similarity index 100% rename from build/build-clang/clang-tidy-macosx64.json rename to build/build-clang/clang-tidy.json diff --git a/build/build-clang/macosx64.json b/build/build-clang/macosx64.json index c2bf3158bb73..99bc552e3332 100644 --- a/build/build-clang/macosx64.json +++ b/build/build-clang/macosx64.json @@ -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" } diff --git a/build/build-clang/profile.json b/build/build-clang/profile.json index 746aa9245236..483e850cd139 100644 --- a/build/build-clang/profile.json +++ b/build/build-clang/profile.json @@ -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 } diff --git a/build/build-clang/skip-3-stages-win64.json b/build/build-clang/skip-3-stages-win64.json deleted file mode 100644 index ff57a87b6323..000000000000 --- a/build/build-clang/skip-3-stages-win64.json +++ /dev/null @@ -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" -} diff --git a/build/build-clang/skip-3-stages.json b/build/build-clang/skip-3-stages.json deleted file mode 100644 index 79b1bf193f9a..000000000000 --- a/build/build-clang/skip-3-stages.json +++ /dev/null @@ -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" -} diff --git a/build/build-clang/skip-stage-1.json b/build/build-clang/skip-stage-1.json deleted file mode 100644 index aa1101b13b67..000000000000 --- a/build/build-clang/skip-stage-1.json +++ /dev/null @@ -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" -} diff --git a/build/build-clang/1stage.json b/build/build-clang/stage-1.json similarity index 100% rename from build/build-clang/1stage.json rename to build/build-clang/stage-1.json diff --git a/build/build-clang/stage-4-pgo.json b/build/build-clang/stage-4-pgo.json new file mode 100644 index 000000000000..8c3d7a97e176 --- /dev/null +++ b/build/build-clang/stage-4-pgo.json @@ -0,0 +1,6 @@ +{ + "skip_stages": "3", + "stages": "4", + "targets": "X86;ARM;AArch64;WebAssembly", + "pgo": true +} diff --git a/build/build-clang/use-clang-artifact.json b/build/build-clang/use-clang-artifact.json new file mode 100644 index 000000000000..f887fbe03740 --- /dev/null +++ b/build/build-clang/use-clang-artifact.json @@ -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" +} diff --git a/build/build-clang/skip-stage-1-win64.json b/build/build-clang/use-clang-cl-artifact.json similarity index 89% rename from build/build-clang/skip-stage-1-win64.json rename to build/build-clang/use-clang-cl-artifact.json index 8bc81d08620a..6b0e49ee266a 100644 --- a/build/build-clang/skip-stage-1-win64.json +++ b/build/build-clang/use-clang-cl-artifact.json @@ -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", diff --git a/build/build-clang/linux64.json b/build/build-clang/use-system-clang.json similarity index 100% rename from build/build-clang/linux64.json rename to build/build-clang/use-system-clang.json diff --git a/build/build-clang/win64.json b/build/build-clang/win64.json index 9d4dcc589e3b..b2678e2a19b9 100644 --- a/build/build-clang/win64.json +++ b/build/build-clang/win64.json @@ -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" } diff --git a/taskcluster/kinds/toolchain/clang-tidy.yml b/taskcluster/kinds/toolchain/clang-tidy.yml index 1a999e83c222..a91671dd3a64 100644 --- a/taskcluster/kinds/toolchain/clang-tidy.yml +++ b/taskcluster/kinds/toolchain/clang-tidy.yml @@ -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: diff --git a/taskcluster/kinds/toolchain/clang.yml b/taskcluster/kinds/toolchain/clang.yml index 2f3334e0f866..8764f4c2d0dc 100644 --- a/taskcluster/kinds/toolchain/clang.yml +++ b/taskcluster/kinds/toolchain/clang.yml @@ -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: diff --git a/taskcluster/scripts/misc/build-clang.sh b/taskcluster/scripts/misc/build-clang.sh index d7bdaea9f751..22959e03a866 100755 --- a/taskcluster/scripts/misc/build-clang.sh +++ b/taskcluster/scripts/misc/build-clang.sh @@ -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