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

Unified Diff: build/untrusted.gypi

Issue 10915109: Add nacl_sdk gyp meta-target. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: . Created 8 years, 3 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 | « build/nacl_core_sdk.gyp ('k') | src/shared/gio/gio.gyp » ('j') | 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 51a0cf8f334c8455ba6f1599e7c24678b7942254..7ba8342d22c07584b7c59d3791748ec803d6198f 100755
--- a/build/untrusted.gypi
+++ b/build/untrusted.gypi
@@ -61,6 +61,7 @@
'variables': {
'nexe_target': '',
'nlib_target': '',
+ 'nso_target': '',
'build_newlib': 0,
'build_glibc': 0,
'disable_glibc%': 0,
@@ -116,6 +117,7 @@
'python_exe': 'python',
'nexe_target': '',
'nlib_target': '',
+ 'nso_target': '',
'build_newlib': 0,
'build_glibc': 0,
'disable_glibc%': 1,
@@ -560,6 +562,86 @@
},
],
}],
+ ['nso_target!="" and build_glibc!=0 and enable_x86_64!=0 and disable_glibc==0', {
+ 'variables': {
+ 'tool_name': 'glibc',
+ 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc',
+ 'objdir_glibc64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64-so/>(_target_name)',
+ 'source_list_glibc64%': '<(tool_name)-x86-64-so.>(_target_name).source_list.gypcmd',
+ 'out_glibc64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib64/>(nso_target)',
+ },
+ 'actions': [
+ {
+ 'action_name': 'build glibc x86-64 nso',
+ 'msvs_cygwin_shell': 0,
+ 'description': 'building >(out_glibc64)',
+ 'inputs': [
+ '<(DEPTH)/native_client/build/build_nexe.py',
+ '<(DEPTH)/ppapi/ppapi_cpp.gypi',
+ '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+ '>@(extra_deps_glibc64)',
+ '>(source_list_glibc64)',
+ ],
+ 'outputs': ['>(out_glibc64)'],
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+ '>@(extra_args)',
+ '--arch', 'x86-64',
+ '--build', 'glibc_nso',
+ '--root', '<(DEPTH)',
+ '--name', '>(out_glibc64)',
+ '--objdir', '>(objdir_glibc64)',
+ '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
+ '--lib-dirs=>(lib_dirs_glibc64) ',
+ '--compile_flags=-m64 -fPIC ^(compile_flags) >(_compile_flags)',
+ '--defines=^(defines) >(_defines)',
+ '--link_flags=-B<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64 ^(link_flags) >(_link_flags)',
+ '--source-list=^|(<(source_list_glibc64) ^(_sources) ^(sources))',
+ ],
+ },
+ ],
+ }],
+ ['nso_target!="" and build_glibc!=0 and enable_x86_32!=0 and disable_glibc==0', {
+ 'variables': {
+ 'tool_name': 'glibc',
+ 'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc',
+ 'out_glibc32%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool_name)/lib32/>(nso_target)',
+ 'objdir_glibc32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32-so/>(_target_name)',
+ 'source_list_glibc32%': '<(tool_name)-x86-32-so.>(_target_name).source_list.gypcmd',
+ },
+ 'actions': [
+ {
+ 'action_name': 'build glibc x86-32 nso',
+ 'msvs_cygwin_shell': 0,
+ 'description': 'building >(out_glibc32)',
+ 'inputs': [
+ '<(DEPTH)/native_client/build/build_nexe.py',
+ '<(DEPTH)/ppapi/ppapi_cpp.gypi',
+ '>!@pymod_do_main(>(get_sources) >(sources) >(_sources))',
+ '>@(extra_deps_glibc32)',
+ '>(source_list_glibc32)',
+ ],
+ 'outputs': ['>(out_glibc32)'],
+ 'action': [
+ '>(python_exe)',
+ '<(DEPTH)/native_client/build/build_nexe.py',
+ '>@(extra_args)',
+ '--arch', 'x86-32',
+ '--build', 'glibc_nso',
+ '--root', '<(DEPTH)',
+ '--name', '>(out_glibc32)',
+ '--objdir', '>(objdir_glibc32)',
+ '--include-dirs=<(inst_dir)/include ^(include_dirs) >(_include_dirs)',
+ '--lib-dirs=>(lib_dirs_glibc32)',
+ '--compile_flags=-m32 -fPIC ^(compile_flags) >(_compile_flags)',
+ '--defines=^(defines) >(_defines)',
+ '--link_flags=-m32 -B<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32 ^(link_flags) >(_link_flags)',
+ '--source-list=^|(<(source_list_glibc32) ^(_sources) ^(sources))',
+ ],
+ },
+ ],
+ }],
],
},
}],
« no previous file with comments | « build/nacl_core_sdk.gyp ('k') | src/shared/gio/gio.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698