OLD | NEW |
---|---|
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 { | 5 { |
6 'variables': { | 6 'variables': { |
7 'variables': { | 7 'variables': { |
8 # Enable -Werror by default, but put it in a variable so it can | 8 # Enable -Werror by default, but put it in a variable so it can |
9 # be optionally disabled. | 9 # be optionally disabled. |
10 'werror%': '-Werror', | 10 'werror%': '-Werror', |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
172 'include_dirs': ['<(DEPTH)'], | 172 'include_dirs': ['<(DEPTH)'], |
173 'defines': [ | 173 'defines': [ |
174 '<@(nacl_default_defines)', | 174 '<@(nacl_default_defines)', |
175 'NACL_BUILD_ARCH=mips', | 175 'NACL_BUILD_ARCH=mips', |
176 ], | 176 ], |
177 'sources': [], | 177 'sources': [], |
178 'link_flags': [], | 178 'link_flags': [], |
179 }, | 179 }, |
180 }, | 180 }, |
181 }], | 181 }], |
182 ['target_arch=="ia32" or target_arch=="x64"', { | 182 ['(target_arch=="ia32" and OS=="win") or target_arch=="x64"', { |
183 'target_defaults': { | 183 'target_defaults': { |
184 # x86-64 newlib nexe action | 184 # x86-64 newlib nexe action |
185 'target_conditions': [ | 185 'target_conditions': [ |
186 ['nexe_target!="" and build_newlib!=0 and enable_x86_64!=0', { | 186 ['nexe_target!="" and build_newlib!=0 and enable_x86_64!=0', { |
187 'variables': { | 187 'variables': { |
188 'tool_name': 'newlib', | 188 'tool_name': 'newlib', |
189 'out_newlib64%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x64.nexe' , | 189 'out_newlib64%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x64.nexe' , |
190 'objdir_newlib64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_ target_name)', | 190 'objdir_newlib64%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-64/>(_ target_name)', |
191 }, | 191 }, |
192 'actions': [ | 192 'actions': [ |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
356 '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_i nclude_dirs)', | 356 '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs) >(_i nclude_dirs)', |
357 '--compile_flags=--target=x86_64-unknown-nacl -stdlib=libstdc ++ ^(compile_flags) >(_compile_flags) -gline-tables-only ^(pnacl_compile_flags) >(_pnacl_compile_flags)', | 357 '--compile_flags=--target=x86_64-unknown-nacl -stdlib=libstdc ++ ^(compile_flags) >(_compile_flags) -gline-tables-only ^(pnacl_compile_flags) >(_pnacl_compile_flags)', |
358 '--gomadir', '<(gomadir)', | 358 '--gomadir', '<(gomadir)', |
359 '--defines=^(defines) >(_defines)', | 359 '--defines=^(defines) >(_defines)', |
360 '--link_flags=--target=x86_64-unknown-nacl -stdlib=libstdc++ -B>(tc_lib_dir_irt64) ^(pnacl_irt_link_flags) ^(link_flags) >(_link_flags)', | 360 '--link_flags=--target=x86_64-unknown-nacl -stdlib=libstdc++ -B>(tc_lib_dir_irt64) ^(pnacl_irt_link_flags) ^(link_flags) >(_link_flags)', |
361 '--source-list=^(source_list_newlib64)', | 361 '--source-list=^(source_list_newlib64)', |
362 ], | 362 ], |
363 }, | 363 }, |
364 ], | 364 ], |
365 }], | 365 }], |
366 ], | |
367 }, | |
368 }], | |
369 ['target_arch=="ia32" or (target_arch=="x64" and OS=="win")', { | |
Mark Seaborn
2014/07/22 17:40:27
64-bit Windows Chrome builds don't need to include
| |
370 'target_defaults': { | |
371 # x86-64 newlib nexe action | |
binji
2014/07/02 18:49:10
bad comment
| |
372 'target_conditions': [ | |
366 # x86-32 newlib nexe action | 373 # x86-32 newlib nexe action |
367 ['nexe_target!="" and build_newlib!=0 and enable_x86_32!=0', { | 374 ['nexe_target!="" and build_newlib!=0 and enable_x86_32!=0', { |
368 'variables': { | 375 'variables': { |
369 'tool_name': 'newlib', | 376 'tool_name': 'newlib', |
370 'out_newlib32%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x32.nexe' , | 377 'out_newlib32%': '<(PRODUCT_DIR)/>(nexe_target)_newlib_x32.nexe' , |
371 'objdir_newlib32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_ target_name)', | 378 'objdir_newlib32%': '>(INTERMEDIATE_DIR)/<(tool_name)-x86-32/>(_ target_name)', |
372 }, | 379 }, |
373 'actions': [ | 380 'actions': [ |
374 { | 381 { |
375 'action_name': 'build newlib x86-32 nexe', | 382 'action_name': 'build newlib x86-32 nexe', |
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1549 '--defines=^(defines) >(_defines)', | 1556 '--defines=^(defines) >(_defines)', |
1550 '--link_flags=-B>(tc_lib_dir_pnacl_newlib) ^(link_flags) >(_li nk_flags)', | 1557 '--link_flags=-B>(tc_lib_dir_pnacl_newlib) ^(link_flags) >(_li nk_flags)', |
1551 '--source-list=^(source_list_pnacl_newlib_arm)', | 1558 '--source-list=^(source_list_pnacl_newlib_arm)', |
1552 ], | 1559 ], |
1553 }, | 1560 }, |
1554 ], | 1561 ], |
1555 }], | 1562 }], |
1556 ], | 1563 ], |
1557 }], # end ARM | 1564 }], # end ARM |
1558 # ia32 or x64 (want to build both for Windows) | 1565 # ia32 or x64 (want to build both for Windows) |
1559 ['target_arch=="ia32" or target_arch=="x64"', { | 1566 ['target_arch=="ia32" or target_arch=="x64"', { |
Mark Seaborn
2014/07/22 17:40:27
What about this one?
To avoid duplication, can we
| |
1560 'target_conditions': [ | 1567 'target_conditions': [ |
1561 # x64 | 1568 # x64 |
1562 ['enable_x86_64!=0 and disable_pnacl==0 and pnacl_native_biased==1 ' | 1569 ['enable_x86_64!=0 and disable_pnacl==0 and pnacl_native_biased==1 ' |
1563 'and nlib_target!="" and build_pnacl_newlib!=0', { | 1570 'and nlib_target!="" and build_pnacl_newlib!=0', { |
1564 'variables': { | 1571 'variables': { |
1565 'tool_name': 'pnacl_newlib_x86_64', | 1572 'tool_name': 'pnacl_newlib_x86_64', |
1566 'out_pnacl_newlib_x86_64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool _name)/lib-x86-64/>(nlib_target)', | 1573 'out_pnacl_newlib_x86_64%': '<(SHARED_INTERMEDIATE_DIR)/tc_<(tool _name)/lib-x86-64/>(nlib_target)', |
1567 'objdir_pnacl_newlib_x86_64%': '>(INTERMEDIATE_DIR)/<(tool_name)/ >(_target_name)', | 1574 'objdir_pnacl_newlib_x86_64%': '>(INTERMEDIATE_DIR)/<(tool_name)/ >(_target_name)', |
1568 }, | 1575 }, |
1569 'actions': [ | 1576 'actions': [ |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1745 ], | 1752 ], |
1746 }, | 1753 }, |
1747 ], | 1754 ], |
1748 }], | 1755 }], |
1749 ], | 1756 ], |
1750 }], # end MIPS | 1757 }], # end MIPS |
1751 # end pnacl actions for building ABI-biased native libraries | 1758 # end pnacl actions for building ABI-biased native libraries |
1752 ], # end conditions for pnacl biased nlib | 1759 ], # end conditions for pnacl biased nlib |
1753 }, | 1760 }, |
1754 } | 1761 } |
OLD | NEW |