Index: ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp |
diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp |
index f3880120eec268513fc459c078619063ccec01ff..fa57030641397f3ebb0afc66123f1f1dee7dbb53 100644 |
--- a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp |
+++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp |
@@ -18,13 +18,6 @@ |
'../../../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim', |
'../../../../../native_client/tools.gyp:prep_toolchain', |
], |
- 'conditions': [ |
- ['target_arch=="mipsel"', { |
- 'dependencies!': [ |
- '../../../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim', |
- ], |
- }], |
- ], |
'sources': [ |
'pnacl_component_crx_gen.py', |
], |
@@ -104,11 +97,17 @@ |
'<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_libcrt_platform_a', |
'<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_libgcc_a', |
'<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_libgcc_eh_a', |
- '<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_libpnacl_irt_shim_dummy_a', |
+ '<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_libpnacl_irt_shim_a', |
'<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_llc_nexe', |
], |
+ 'inputs': [ |
+ '>(tc_lib_dir_pnacl_translate)/lib-mips32/libpnacl_irt_shim.a', |
+ ], |
'variables': { |
- 'lib_overrides': [], |
+ 'lib_overrides': [ |
+ # Use the freshly generated shim. |
+ '--lib_override=mipsel,>(tc_lib_dir_pnacl_translate)/lib-mips32/libpnacl_irt_shim.a', |
+ ], |
}, |
}], |
['target_arch=="ia32"', { |