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

Unified Diff: test/mac/archs/test-archs-multiarch.gyp

Issue 196283023: ninja/mac: Fix multiarch link regression caused by 1871. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 6 years, 9 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 | « pylib/gyp/generator/ninja.py ('k') | test/mac/gyptest-archs.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/mac/archs/test-archs-multiarch.gyp
===================================================================
--- test/mac/archs/test-archs-multiarch.gyp (revision 1873)
+++ test/mac/archs/test-archs-multiarch.gyp (working copy)
@@ -21,6 +21,16 @@
},
},
{
+ 'target_name': 'shared_32_64_bundle',
+ 'product_name': 'My Framework',
+ 'type': 'shared_library',
+ 'mac_bundle': 1,
+ 'sources': [ 'my_file.cc' ],
+ 'xcode_settings': {
+ 'ARCHS': [ 'i386', 'x86_64' ],
+ },
+ },
+ {
'target_name': 'module_32_64',
'type': 'loadable_module',
'sources': [ 'my_file.cc' ],
@@ -29,6 +39,16 @@
},
},
{
+ 'target_name': 'module_32_64_bundle',
+ 'product_name': 'My Bundle',
+ 'type': 'loadable_module',
+ 'mac_bundle': 1,
+ 'sources': [ 'my_file.cc' ],
+ 'xcode_settings': {
+ 'ARCHS': [ 'i386', 'x86_64' ],
+ },
+ },
+ {
'target_name': 'exe_32_64',
'type': 'executable',
'sources': [ 'empty_main.cc' ],
« no previous file with comments | « pylib/gyp/generator/ninja.py ('k') | test/mac/gyptest-archs.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698