Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(850)

Unified Diff: src/trusted/service_runtime/linux/nacl_bootstrap.gyp

Issue 341573003: Don't remove -m32 when building ia32 targets. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/trusted/service_runtime/linux/nacl_bootstrap.gyp
===================================================================
--- src/trusted/service_runtime/linux/nacl_bootstrap.gyp (revision 13364)
+++ src/trusted/service_runtime/linux/nacl_bootstrap.gyp (working copy)
@@ -43,22 +43,6 @@
'libraries': [
'-lelf',
],
- # This is an ugly kludge because gyp doesn't actually treat
- # host_arch=x64 target_arch=ia32 as proper cross compilation.
- # It still wants to compile the "host" program with -m32 et
- # al. Though a program built that way can indeed run on the
- # x86-64 host, we cannot reliably build this program on such a
- # host because Ubuntu does not provide the full suite of
- # x86-32 libraries in packages that can be installed on an
- # x86-64 host; in particular, libelf is missing. So here we
- # use the hack of eliding all the -m* flags from the
- # compilation lines, getting the command close to what they
- # would be if gyp were to really build properly for the host.
- # TODO(bradnelson): Clean up with proper cross support.
- 'cflags/': [['exclude', '^-m.*'],
- ['exclude', '^--sysroot=.*']],
- 'ldflags/': [['exclude', '^-m.*'],
- ['exclude', '^--sysroot=.*']],
'cflags!': [
# MemorySanitizer reports an error in this binary unless instrumented
# libelf is supplied. Because libelf source code uses gcc extensions,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698