Index: src/untrusted/irt/irt.gyp |
diff --git a/src/untrusted/irt/irt.gyp b/src/untrusted/irt/irt.gyp |
index ef24b3f01900aab554a84835bb12d2ce54fefbc9..19b9bc53478428b8306a7cddbf311bfccb5453b8 100644 |
--- a/src/untrusted/irt/irt.gyp |
+++ b/src/untrusted/irt/irt.gyp |
@@ -52,10 +52,16 @@ |
}, |
'targets': [ |
{ |
- 'target_name': 'irt_core_nexe', |
+ 'target_name': 'irt_core_raw_nexe', |
'type': 'none', |
'variables': { |
- 'nexe_target': 'irt_core', |
+ 'nexe_target': 'irt_core_raw', |
+ # These out_* fields override the default filenames, which |
+ # include a "_newlib" suffix and places them in the target |
+ # directory. |
+ 'out_newlib64': '<(SHARED_INTERMEDIATE_DIR)/irt_core_x86_64_raw.nexe', |
+ 'out_newlib32': '<(SHARED_INTERMEDIATE_DIR)/irt_core_x86_32_raw.nexe', |
+ 'out_newlib_arm': '<(SHARED_INTERMEDIATE_DIR)/irt_core_arm_raw.nexe', |
'build_glibc': 0, |
'build_newlib': 0, |
'build_irt': 1, |
@@ -86,6 +92,63 @@ |
], |
}, |
{ |
+ 'target_name': 'irt_core_nexe', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'irt_core_raw_nexe', |
+ '<(DEPTH)/native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', |
+ ], |
+ 'conditions': [ |
+ ['target_arch=="arm"', { |
+ 'actions': [ |
+ { |
+ 'action_name': 'tls_edit_irt_arm', |
+ 'message': 'Patching TLS for irt_core (arm)', |
+ 'msvs_cygwin_shell': 0, |
+ 'inputs': [ |
+ '<(PRODUCT_DIR)/tls_edit', |
+ '<(SHARED_INTERMEDIATE_DIR)/irt_core_arm_raw.nexe', |
+ ], |
+ 'outputs': [ |
+ '<(PRODUCT_DIR)/irt_core_newlib_arm.nexe', |
+ ], |
+ 'action': ['<@(_inputs)', '<@(_outputs)'], |
+ }, |
+ ], |
+ }], |
+ ['target_arch!="arm"', { |
+ 'actions': [ |
+ { |
+ 'action_name': 'tls_edit_irt_x86-64', |
+ 'message': 'Patching TLS for irt_core (x86-64)', |
+ 'msvs_cygwin_shell': 0, |
+ 'inputs': [ |
+ '<(PRODUCT_DIR)/tls_edit', |
+ '<(SHARED_INTERMEDIATE_DIR)/irt_core_x86_64_raw.nexe', |
+ ], |
+ 'outputs': [ |
+ '<(PRODUCT_DIR)/irt_core_newlib_x64.nexe', |
+ ], |
+ 'action': ['<@(_inputs)', '<@(_outputs)'], |
+ }, |
+ { |
+ 'action_name': 'tls_edit_irt_x86-32', |
+ 'message': 'Patching TLS for irt_core (x86-32)', |
+ 'msvs_cygwin_shell': 0, |
+ 'inputs': [ |
+ '<(PRODUCT_DIR)/tls_edit', |
+ '<(SHARED_INTERMEDIATE_DIR)/irt_core_x86_32_raw.nexe', |
+ ], |
+ 'outputs': [ |
+ '<(PRODUCT_DIR)/irt_core_newlib_x32.nexe', |
+ ], |
+ 'action': ['<@(_inputs)', '<@(_outputs)'], |
+ }, |
+ ], |
+ }], |
+ ], |
+ }, |
+ { |
'target_name': 'irt_browser_lib', |
'type': 'none', |
'variables': { |