mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-18 22:54:00 +00:00
20 lines
859 B
Diff
20 lines
859 B
Diff
--- native_client/build/untrusted.gypi (revision 10450)
|
|
+++ native_client/build/untrusted.gypi (working copy)
|
|
@@ -771,7 +771,7 @@
|
|
],
|
|
},
|
|
'target_conditions': [
|
|
- ['nexe_target!="" and build_pnacl_newlib!=0', {
|
|
+ ['nexe_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
|
|
'variables': {
|
|
'out_pnacl_newlib_x86_32_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x32.nexe',
|
|
'out_pnacl_newlib_x86_64_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x64.nexe',
|
|
@@ -889,7 +889,7 @@
|
|
}],
|
|
],
|
|
}],
|
|
- ['nlib_target!="" and build_pnacl_newlib!=0', {
|
|
+ ['nlib_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
|
|
'variables': {
|
|
'tool_name': 'pnacl_newlib',
|
|
'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib',
|