diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-03-19 17:39:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-20 14:05:33 +0000 |
| commit | 7b065e124c8b8fe83aa68fe4ee9ddb28820feffb (patch) | |
| tree | 0f6951485e1b6af1ef01fbfe74374466a3efae0e /infra/bots/recipes/compile.expected/alternate_repo.json | |
| parent | f20710e00cbb978942fe5a5ffb35be847bde6eb2 (diff) | |
[recipes] Add toolchain version to extra_cflags.
In compile recipes, add a dummy define (e.g.
-DDUMMY_clang_linux_version=42) to the compiler flags so that ninja will
recompile from scratch when the toolchain changes.
Bug: skia:7720
Change-Id: I9a330b21af364b3aa6a1eebbe6ac2022cfa82fdc
Reviewed-on: https://skia-review.googlesource.com/115160
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipes/compile.expected/alternate_repo.json')
| -rw-r--r-- | infra/bots/recipes/compile.expected/alternate_repo.json | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/infra/bots/recipes/compile.expected/alternate_repo.json b/infra/bots/recipes/compile.expected/alternate_repo.json index 26027bd6e7..601a419c26 100644 --- a/infra/bots/recipes/compile.expected/alternate_repo.json +++ b/infra/bots/recipes/compile.expected/alternate_repo.json @@ -97,6 +97,24 @@ "cmd": [ "python", "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[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" + }, + { + "cmd": [ + "python", + "-u", "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", @@ -116,7 +134,7 @@ "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", "gen", "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", - "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/win_vulkan_sdk\" target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" + "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/win_vulkan_sdk\" target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { |