diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-21 23:23:57 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-21 23:23:57 +0000 |
| commit | 3a41c8ef2ff227227a1e50e72f2c70a1f3a11add (patch) | |
| tree | e1584400b76a49bef5f7c40e1a9a5ea55590ec34 /base/base.gyp | |
| parent | 13bb1e3b9240d86056e3eccad421bb4aa6437223 (diff) | |
| download | chromium_src-3a41c8ef2ff227227a1e50e72f2c70a1f3a11add.zip chromium_src-3a41c8ef2ff227227a1e50e72f2c70a1f3a11add.tar.gz chromium_src-3a41c8ef2ff227227a1e50e72f2c70a1f3a11add.tar.bz2 | |
Disabling nacl_win64 targets when building in target_arch!=ia32 mode.
When building on windows with target_arch=x64, we no longer need win32 targets
forced to be 64-bit. This gates out these targets when target_arch!=ia32.
(Prior CL dropped the minimal set to break the dependency between these targets
and the rest of the build. This eliminates them completely.)
BUG=None
TEST=None
R=jschuh@chromium.org,thestig@chromium.org
TBR=darin@chromium.org,abodenha@chromium.org,apatrick@chromium.org,sra@chromium.org,wtc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11929039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/base/base.gyp b/base/base.gyp index f3ffb9e..48e0f50 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -389,37 +389,6 @@ '..', ], }, - { - # TODO(rvargas): Remove this when gyp finally supports a clean model. - # See bug 36232. - 'target_name': 'base_static_win64', - 'type': 'static_library', - 'sources': [ - 'base_switches.cc', - 'base_switches.h', - 'win/pe_image.cc', - 'win/pe_image.h', - ], - 'sources!': [ - # base64.cc depends on modp_b64. - 'base64.cc', - ], - 'include_dirs': [ - '..', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - 'defines': [ - 'NACL_WIN64', - ], - # TODO(rvargas): Bug 78117. Remove this. - 'msvs_disabled_warnings': [ - 4244, - ], - }, # Include this target for a main() function that simply instantiates # and runs a base::TestSuite. { @@ -920,7 +889,7 @@ }, ], }], - ['OS == "win"', { + ['OS == "win" and target_arch=="ia32"', { 'targets': [ { 'target_name': 'base_nacl_win64', @@ -986,6 +955,37 @@ }, }, }, + { + # TODO(rvargas): Remove this when gyp finally supports a clean model. + # See bug 36232. + 'target_name': 'base_static_win64', + 'type': 'static_library', + 'sources': [ + 'base_switches.cc', + 'base_switches.h', + 'win/pe_image.cc', + 'win/pe_image.h', + ], + 'sources!': [ + # base64.cc depends on modp_b64. + 'base64.cc', + ], + 'include_dirs': [ + '..', + ], + 'configurations': { + 'Common_Base': { + 'msvs_target_platform': 'x64', + }, + }, + 'defines': [ + 'NACL_WIN64', + ], + # TODO(rvargas): Bug 78117. Remove this. + 'msvs_disabled_warnings': [ + 4244, + ], + }, ], }], ['os_posix==1 and OS!="mac" and OS!="ios"', { |