Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/untrusted.gypi

Issue 1613603002: Revert of untrusted.gypi: Remove support for old gcc newlib toolchain (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: Created 4 years, 11 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/untrusted.gypi
diff --git a/build/untrusted.gypi b/build/untrusted.gypi
index 11524776971f0a964bb06cc9218f668e7a65c4a4..2be0ad4cc09f06eb6b7ad3054d8e403800889492 100755
--- a/build/untrusted.gypi
+++ b/build/untrusted.gypi
@@ -10,6 +10,10 @@
'werror%': '-Werror',
# 1 to use goma.
'use_goma%': 0,
+ # Set to 1 to use nacl-clang rather than gcc newlib toolchain.
+ # This is designed to be set globally by GYP_DEFINES and currently
+ # only affects x86-32 and x86-64 newlib builds.
+ 'use_nacl_clang%': 0,
},
'common_args': [
'python',
@@ -54,6 +58,15 @@
'conditions': [
['use_goma==0', {
'gomadir%': '',
+ }],
+ ['use_nacl_clang==1', {
+ 'newlib_nlib_arg': 'newlib_nlib_clang',
+ 'newlib_nexe_arg': 'newlib_nexe_clang',
+ 'arm_compile_flags': '',
+ }, {
+ 'newlib_nlib_arg': 'newlib_nlib',
+ 'newlib_nexe_arg': 'newlib_nexe',
+ 'arm_compile_flags': '-Wno-unused-local-typedefs -Wno-psabi',
}],
['OS=="android"', {
'TOOLCHAIN_OS': 'linux',
@@ -240,7 +253,7 @@
'<@(common_args)',
'>@(extra_args)',
'--arch', 'x86-64',
- '--build', 'newlib_nexe_clang',
+ '--build', '<(newlib_nexe_arg)',
'--name', '>(out_newlib64)',
'--objdir', '>(objdir_newlib64)',
'--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
@@ -281,7 +294,7 @@
'<@(common_args)',
'>@(extra_args)',
'--arch', 'x86-64',
- '--build', 'newlib_nlib_clang',
+ '--build', '<(newlib_nlib_arg)',
'--name', '>(out_newlib64)',
'--objdir', '>(objdir_newlib64)',
'--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
@@ -409,7 +422,7 @@
'<@(common_args)',
'>@(extra_args)',
'--arch', 'x86-32',
- '--build', 'newlib_nexe_clang',
+ '--build', '<(newlib_nexe_arg)',
'--name', '>(out_newlib32)',
'--objdir', '>(objdir_newlib32)',
'--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
@@ -450,7 +463,7 @@
'<@(common_args)',
'>@(extra_args)',
'--arch', 'x86-32',
- '--build', 'newlib_nlib_clang',
+ '--build', '<(newlib_nlib_arg)',
'--name', '>(out_newlib32)',
'--objdir', '>(objdir_newlib32)',
'--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
@@ -692,7 +705,7 @@
'--name', '>(out_glibc_arm)',
'--objdir', '>(objdir_glibc_arm)',
'--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
- '--compile_flags=^(compile_flags) >(_compile_flags)',
+ '--compile_flags=<(arm_compile_flags) ^(compile_flags) >(_compile_flags)',
'--gomadir', '<(gomadir)',
'--defines=^(defines) >(_defines)',
'--link_flags=-B>(tc_lib_dir_glibc_arm) -L>(tc_lib_dir_glibc_arm) ^(link_flags) >(_link_flags)',
@@ -732,7 +745,7 @@
'--name', '>(out_glibc_arm)',
'--objdir', '>(objdir_glibc_arm)',
'--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
- '--compile_flags=^(compile_flags) >(_compile_flags)',
+ '--compile_flags=<(arm_compile_flags) ^(compile_flags) >(_compile_flags)',
'--gomadir', '<(gomadir)',
'--defines=^(defines) >(_defines)',
'--link_flags=-B>(tc_lib_dir_glibc_arm) ^(link_flags) >(_link_flags)',
@@ -772,7 +785,7 @@
'--name', '>(out_glibc_arm)',
'--objdir', '>(objdir_glibc_arm)',
'--include-dirs=>(tc_include_dir_glibc) ^(include_dirs) >(_include_dirs)',
- '--compile_flags=-fPIC ^(compile_flags) >(_compile_flags)',
+ '--compile_flags=-fPIC <(arm_compile_flags) ^(compile_flags) >(_compile_flags)',
'--gomadir', '<(gomadir)',
'--defines=^(defines) >(_defines)',
'--link_flags=-B>(tc_lib_dir_glibc_arm) ^(link_flags) >(_link_flags)',
@@ -809,11 +822,11 @@
'<@(common_args)',
'>@(extra_args)',
'--arch', 'arm',
- '--build', 'newlib_nexe_clang',
+ '--build', '<(newlib_nexe_arg)',
'--name', '>(out_newlib_arm)',
'--objdir', '>(objdir_newlib_arm)',
'--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
- '--compile_flags=^(compile_flags) >(_compile_flags)',
+ '--compile_flags=<(arm_compile_flags) ^(compile_flags) >(_compile_flags)',
'--gomadir', '<(gomadir)',
'--defines=^(defines) >(_defines)',
'--link_flags=-B>(tc_lib_dir_newlib_arm) -L>(tc_lib_dir_newlib_arm) ^(link_flags) >(_link_flags)',
@@ -850,11 +863,11 @@
'<@(common_args)',
'>@(extra_args)',
'--arch', 'arm',
- '--build', 'newlib_nlib_clang',
+ '--build', '<(newlib_nlib_arg)',
'--name', '>(out_newlib_arm)',
'--objdir', '>(objdir_newlib_arm)',
'--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_include_dirs)',
- '--compile_flags=^(compile_flags) >(_compile_flags)',
+ '--compile_flags=<(arm_compile_flags) ^(compile_flags) >(_compile_flags)',
'--gomadir', '<(gomadir)',
'--defines=^(defines) >(_defines)',
'--link_flags=-B>(tc_lib_dir_newlib_arm) ^(link_flags) >(_link_flags)',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698