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/allocator | |
| 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/allocator')
| -rw-r--r-- | base/allocator/allocator.gyp | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 46861ec..78aa7aa 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -546,6 +546,27 @@ ], }, { + 'target_name': 'tcmalloc_unittest', + 'type': 'executable', + 'sources': [ + 'tcmalloc_unittest.cc', + ], + 'include_dirs': [ + '../..', + # For constants of TCMalloc. + '<(tcmalloc_dir)/src', + ], + 'dependencies': [ + '../../testing/gtest.gyp:gtest', + '../base.gyp:base', + 'allocator', + ], + }, + ], + }], + ['OS=="win" and target_arch=="ia32"', { + 'targets': [ + { 'target_name': 'allocator_extension_thunks_win64', 'type': 'static_library', 'sources': [ @@ -562,23 +583,6 @@ }, }, }, - { - 'target_name': 'tcmalloc_unittest', - 'type': 'executable', - 'sources': [ - 'tcmalloc_unittest.cc', - ], - 'include_dirs': [ - '../..', - # For constants of TCMalloc. - '<(tcmalloc_dir)/src', - ], - 'dependencies': [ - '../../testing/gtest.gyp:gtest', - '../base.gyp:base', - 'allocator', - ], - }, ], }], ['OS=="linux" and clang_type_profiler==1', { |