Commit 8d81593b authored by Nico Weber's avatar Nico Weber

win/swarming: Make 64-bit debug component builds work on swarming?

After https://codereview.chromium.org/896583002/, the isolate step on the
64-bit bot is failing with

    MappingError: Input file C:\b\build\slave\CrWinClang64_dbg_\build\src\out\Debug_x64\x64\msvcp120d.dll doesn't exist

It looks like the x64\msvcp120d.dll only exists in 32-bit builds.
While here, also add the x64 libraries for 32-bit release builds.

BUG=453657,452057
R=maruel@chromium.org, scottmg@chromium.org

Review URL: https://codereview.chromium.org/897713002

Cr-Commit-Position: refs/heads/master@{#314410}
parent 4555495a
...@@ -53,23 +53,35 @@ ...@@ -53,23 +53,35 @@
], ],
}, },
}], }],
# Copy the VS runtime DLLs into the isolate so that they
# don't have to be preinstalled on the target machine.
['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/x64/msvcp120d.dll',
'<(PRODUCT_DIR)/x64/msvcr120d.dll',
],
},
}],
['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/x64/msvcp120.dll',
'<(PRODUCT_DIR)/x64/msvcr120.dll',
],
},
}],
['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', { ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
'variables': { 'variables': {
'files': [ 'files': [
# Copy the VS runtime DLLs into the isolate so that they
# don't have to be preinstalled on the target machine.
'<(PRODUCT_DIR)/msvcp120d.dll', '<(PRODUCT_DIR)/msvcp120d.dll',
'<(PRODUCT_DIR)/msvcr120d.dll', '<(PRODUCT_DIR)/msvcr120d.dll',
'<(PRODUCT_DIR)/x64/msvcp120d.dll',
'<(PRODUCT_DIR)/x64/msvcr120d.dll',
], ],
}, },
}], }],
['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', { ['OS=="win" and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
'variables': { 'variables': {
'files': [ 'files': [
# Copy the VS runtime DLLs into the isolate so that they
# don't have to be preinstalled on the target machine.
'<(PRODUCT_DIR)/msvcp120.dll', '<(PRODUCT_DIR)/msvcp120.dll',
'<(PRODUCT_DIR)/msvcr120.dll', '<(PRODUCT_DIR)/msvcr120.dll',
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment