Commit cc09711e authored by thestig's avatar thestig Committed by Commit bot

Forcefully set the right gyp variables for 32-bit Linux builds.

BUG=455572
TBR=thakis@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#314799}
parent 393309fd
...@@ -1591,6 +1591,12 @@ ...@@ -1591,6 +1591,12 @@
# Use a 64-bit linker to avoid running out of address space. The # Use a 64-bit linker to avoid running out of address space. The
# buildbots should have a 64-bit kernel and a 64-bit libc installed. # buildbots should have a 64-bit kernel and a 64-bit libc installed.
['host_arch=="ia32" and target_arch=="ia32"', { ['host_arch=="ia32" and target_arch=="ia32"', {
# TODO(thestig) This is a horrible way to force the desired
# configuration. Our gyp variable scoping is likely wrong and
# needs to be cleaned up. The GN configuration should be changed
# to match.
'binutils_version%': 224,
'linux_use_bundled_binutils%': '1',
'linux_use_bundled_gold%': '1', 'linux_use_bundled_gold%': '1',
'binutils_dir%': 'third_party/binutils/Linux_x64/Release/bin', 'binutils_dir%': 'third_party/binutils/Linux_x64/Release/bin',
}], }],
......
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