--- chromium-browser-24.0.1312.45/src/native_client/src/untrusted/nacl/nacl.gyp~	2012-12-19 10:03:43.000000000 +0200
+++ chromium-browser-24.0.1312.45/src/native_client/src/untrusted/nacl/nacl.gyp	2013-01-01 22:26:15.004609235 +0200
@@ -94,7 +94,7 @@
         'nlib_target': 'libnacl.a',
         'build_glibc': 0,
         'build_newlib': 1,
-        'build_pnacl_newlib': 1,
+        'build_pnacl_newlib%': 0,
       },
       'sources': [
         '<@(sources_for_nacl_extensions)',
--- a/src/native_client/build/untrusted.gypi	(revision 10450)
+++ b/src/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',