build/untrusted.gypi - Issue 11363175: Honor werror variable for untrusted builds.

Unified Diff: build/untrusted.gypi

Issue 11363175: Honor werror variable for untrusted builds. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: rebase Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/untrusted.gypi

diff --git a/build/untrusted.gypi b/build/untrusted.gypi

index a3a17437f8e0c11c4128ce77509d46011cde5681..10844f08203e8fb8b24bb01f2397096a6ead265f 100755

--- a/build/untrusted.gypi

+++ b/build/untrusted.gypi

@@ -26,6 +26,7 @@

'-O2',

'-g',

'-Wall',

+ '-Werror',

'-fdiagnostics-show-option',

@@ -343,7 +344,7 @@

'--objdir', '>(objdir_newlib_arm)',

'--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',

'--lib-dirs=>(lib_dirs_newlib_arm) ',

- '--compile_flags=--pnacl-frontend-triple=armv7-unknown-nacl-gnueabi -mfloat-abi=hard ^(pnacl_compile_flags) >(_pnacl_compile_flags) ^(compile_flags) >(_compile_flags)',

+ '--compile_flags=--pnacl-frontend-triple=armv7-unknown-nacl-gnueabi -mfloat-abi=hard ^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',

'--defines=^(defines) >(_defines)',

'--link_flags=-arch arm --pnacl-allow-translate --pnacl-allow-native -B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm ^(link_flags) >(_link_flags)',

'--source-list=^|(<(source_list_newlib_arm) ^(_sources) ^(sources))',

@@ -383,7 +384,7 @@

'--objdir', '>(objdir_newlib_arm)',

'--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',

'--lib-dirs=>(lib_dirs_newlib_arm) ',

- '--compile_flags=--pnacl-frontend-triple=armv7-unknown-nacl-gnueabi -mfloat-abi=hard ^(pnacl_compile_flags) >(_pnacl_compile_flags) ^(compile_flags) >(_compile_flags)',

+ '--compile_flags=--pnacl-frontend-triple=armv7-unknown-nacl-gnueabi -mfloat-abi=hard ^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',

'--defines=^(defines) >(_defines)',

'--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm ^(link_flags) >(_link_flags)',

'--source-list=^|(<(source_list_newlib_arm) ^(_sources) ^(sources))',

@@ -718,7 +719,7 @@

'--objdir', '>(objdir_pnacl_newlib)',

'--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',

'--lib-dirs=>(lib_dirs_pnacl_newlib)',

- '--compile_flags=^(pnacl_compile_flags) >(_pnacl_compile_flags) ^(compile_flags) >(_compile_flags)',

+ '--compile_flags=^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',

'--defines=^(defines) >(_defines)',

'--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib/lib ^(link_flags) >(_link_flags)',

'--source-list=^|(<(source_list_pnacl_newlib) ^(_sources) ^(sources))',

@@ -829,7 +830,7 @@

'--objdir', '>(objdir_pnacl_newlib)',

'--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',

'--lib-dirs=>(lib_dirs_pnacl_newlib) ',

- '--compile_flags=^(pnacl_compile_flags) >(_pnacl_compile_flags) ^(compile_flags) >(_compile_flags)',

+ '--compile_flags=^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',

'--defines=^(defines) >(_defines)',

'--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib/lib ^(link_flags) >(_link_flags)',

'--source-list=^|(<(source_list_pnacl_newlib) ^(_sources) ^(sources))',

« no previous file with comments | « build/standalone_flags.gypi ('k') | no next file » | no next file with comments »