]> git.pld-linux.org Git - packages/chromium-browser.git/blame - no-pnacl.patch
remove duplicate remove_webcore_debug_symbols=1
[packages/chromium-browser.git] / no-pnacl.patch
CommitLineData
8fb1dc98
ER
1--- chromium-browser-24.0.1312.45/src/native_client/src/untrusted/nacl/nacl.gyp~ 2012-12-19 10:03:43.000000000 +0200
2+++ chromium-browser-24.0.1312.45/src/native_client/src/untrusted/nacl/nacl.gyp 2013-01-01 22:26:15.004609235 +0200
3@@ -94,7 +94,7 @@
4 'nlib_target': 'libnacl.a',
5 'build_glibc': 0,
6 'build_newlib': 1,
7- 'build_pnacl_newlib': 1,
57ad0199 8+ 'build_pnacl_newlib%': 0,
8fb1dc98
ER
9 },
10 'sources': [
11 '<@(sources_for_nacl_extensions)',
4d449af9
ER
12--- a/src/native_client/build/untrusted.gypi (revision 10450)
13+++ b/src/native_client/build/untrusted.gypi (working copy)
14@@ -771,7 +771,7 @@
15 ],
16 },
17 'target_conditions': [
18- ['nexe_target!="" and build_pnacl_newlib!=0', {
19+ ['nexe_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
20 'variables': {
21 'out_pnacl_newlib_x86_32_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x32.nexe',
22 'out_pnacl_newlib_x86_64_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x64.nexe',
23@@ -889,7 +889,7 @@
24 }],
25 ],
26 }],
27- ['nlib_target!="" and build_pnacl_newlib!=0', {
28+ ['nlib_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
29 'variables': {
30 'tool_name': 'pnacl_newlib',
31 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib',
This page took 0.031957 seconds and 4 git commands to generate.