diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-04-03 14:23:26 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-03 19:25:31 +0000 |
| commit | a48caa5601fde4192e7cf5852e36b098047125d6 (patch) | |
| tree | 6ebda01140aaf07264521a7f7251523c61d3590f /infra/bots/recipes | |
| parent | f2da5b3aab2813ff4a4442a9fb9af5fb34e95488 (diff) | |
remove CC,CXX,CPPFLAGS from compile environment
I don't believe any of these have any effect now that all
builds are done through GN. My best recollection is that
they used to affect GYP-based builds.
Change-Id: Ifde9f7c4d531dab43e8d407fc779d2ab6e38411c
Reviewed-on: https://skia-review.googlesource.com/118263
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes')
28 files changed, 1 insertions, 279 deletions
diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json index 098dbe7fb1..84b602586a 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" @@ -140,9 +134,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" @@ -162,9 +154,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json index f79dd9aaba..334d2260d4 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get android_ndk_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json index 473b7caeff..121fcf35fe 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get android_ndk_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json index 7afd40428e..a750df81b3 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get android_ndk_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json index b96bce33fa..22c57ee902 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json index 0b8266dcb1..a32d2c5036 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json index d07aa1d6a5..7ea5e04b65 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index e0031512c7..dbf96708a4 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -104,11 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_linux VERSION" }, @@ -121,10 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, @@ -141,10 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, @@ -161,10 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json index e7ea2ca256..2806f09130 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json index c21fe00b77..823b946a5b 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES" }, @@ -160,9 +152,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json index 0523c2b925..ba6d6c8e84 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json index ad239f90b5..b61f534eb7 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json index 5881e9aa33..8c3afd81e2 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json @@ -75,10 +75,6 @@ "[START_DIR]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_linux VERSION" }, @@ -91,9 +87,7 @@ "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS" }, @@ -110,9 +104,7 @@ "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS" }, @@ -129,9 +121,7 @@ "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json index 4421519195..dc32da577e 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json index 004aea37bb..221d515fd7 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_linux VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage" }, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json index b4786d3091..7775face41 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json @@ -104,10 +104,6 @@ "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_darwin/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get android_ndk_darwin VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android" }, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json index 1a6f59db3e..354470d148 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -102,9 +102,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, @@ -121,9 +119,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, @@ -140,9 +136,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json index 6947e707c6..541f4416b1 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json @@ -102,9 +102,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x64-Release-iOS" }, @@ -121,9 +119,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x64-Release-iOS" }, @@ -140,9 +136,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x64-Release-iOS" }, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 3082c951a3..bd0ecacd2b 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -212,9 +212,7 @@ ], "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, @@ -229,9 +227,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, @@ -248,9 +244,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, @@ -267,9 +261,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json index 2d4780c324..3d402c41f8 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json @@ -102,9 +102,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release" }, @@ -121,9 +119,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release" }, @@ -140,9 +136,7 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release" }, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json index c610e812ce..16233726f5 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json @@ -104,10 +104,6 @@ "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\assets\\android_ndk_windows\\VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get android_ndk_windows VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-Android" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-Android" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-Android" }, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json index a883eba66e..b49cd3676a 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json @@ -104,10 +104,6 @@ "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\assets\\clang_win\\VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_win VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions" }, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json index 9bd8f129e3..a5087d35fe 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json @@ -104,10 +104,6 @@ "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\assets\\clang_win\\VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_win VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Debug", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug" }, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json index 04956b39e9..f7b9e22de9 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json @@ -104,10 +104,6 @@ "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\assets\\clang_win\\VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_win VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Debug_x64", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Debug_x64", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Debug_x64", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE" }, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index db42141bee..6a906a3e85 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json @@ -104,10 +104,6 @@ "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\assets\\clang_win\\VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_win VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Release_x64", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Release_x64", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { "BUILDTYPE": "Release_x64", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan" }, diff --git a/infra/bots/recipes/compile.expected/alternate_repo.json b/infra/bots/recipes/compile.expected/alternate_repo.json index 601a419c26..d7baedd595 100644 --- a/infra/bots/recipes/compile.expected/alternate_repo.json +++ b/infra/bots/recipes/compile.expected/alternate_repo.json @@ -104,10 +104,6 @@ "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/clang_win/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_win VERSION" }, @@ -120,9 +116,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, @@ -139,9 +133,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, @@ -158,9 +150,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, diff --git a/infra/bots/recipes/compile.expected/trybot.json b/infra/bots/recipes/compile.expected/trybot.json index f0453d15a4..7e949331dc 100644 --- a/infra/bots/recipes/compile.expected/trybot.json +++ b/infra/bots/recipes/compile.expected/trybot.json @@ -108,10 +108,6 @@ "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/clang_win/VERSION", "/path/to/tmp/" ], - "env": { - "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" - }, "infra_step": true, "name": "Get clang_win VERSION" }, @@ -124,9 +120,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, @@ -143,9 +137,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, @@ -162,9 +154,7 @@ "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", - "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py index 2c4f205879..ab251fb7f0 100644 --- a/infra/bots/recipes/compile.py +++ b/infra/bots/recipes/compile.py @@ -26,35 +26,17 @@ def build_targets_from_builder_dict(builder_dict): return ['most'] -def get_extra_env_vars(vars_api): - env = {} - if vars_api.builder_cfg.get('compiler') == 'Clang': - env['CC'] = '/usr/bin/clang' - env['CXX'] = '/usr/bin/clang++' - - # SKNX_NO_SIMD, SK_USE_DISCARDABLE_SCALEDIMAGECACHE, etc. - # TODO(benjaminwagner): Same appears in gn_flavor.py to set extra_cflags. Are - # both needed? - if (len(vars_api.extra_tokens) == 1 and - vars_api.extra_tokens[0].startswith('SK')): - env['CPPFLAGS'] = '-D' + vars_api.extra_tokens[0] - - return env - - def RunSteps(api): bot_update=True if 'NoDEPS' in api.properties['buildername']: bot_update = False api.core.setup(bot_update=bot_update) - env = get_extra_env_vars(api.vars) build_targets = build_targets_from_builder_dict(api.vars.builder_cfg) try: for target in build_targets: - with api.context(env=env): - api.flavor.compile(target) + api.flavor.compile(target) api.run.copy_build_products( api.flavor.out_dir, api.vars.swarming_out_dir.join( |