diff options
| author | brucedawson <brucedawson@chromium.org> | 2016-01-11 14:54:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-11 22:55:16 +0000 |
| commit | 110b66f4247d671f4e58cafe7f9ac359ad338e00 (patch) | |
| tree | cd1824363cf02fe760c8902c9ccad79e60d02707 /base | |
| parent | b833445d89f724f69e1b44930b0d7b364edb0217 (diff) | |
| download | chromium_src-110b66f4247d671f4e58cafe7f9ac359ad338e00.zip chromium_src-110b66f4247d671f4e58cafe7f9ac359ad338e00.tar.gz chromium_src-110b66f4247d671f4e58cafe7f9ac359ad338e00.tar.bz2 | |
Disable prep_libc.py on VS 2015 gn builds for now
The prep_libc.py build step doesn't work on VS 2015 so it was disabled
for gyp builds with crrev.com/1105213002. Now we need to disable it for
gn builds. It will get re-enabled in a new form once we have switched
to VS 2015.
BUG=481611,440500
Review URL: https://codereview.chromium.org/1569703002
Cr-Commit-Position: refs/heads/master@{#368697}
Diffstat (limited to 'base')
| -rw-r--r-- | base/allocator/BUILD.gn | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/base/allocator/BUILD.gn b/base/allocator/BUILD.gn index 44de819d..c04a0e1 100644 --- a/base/allocator/BUILD.gn +++ b/base/allocator/BUILD.gn @@ -5,6 +5,10 @@ import("//build/config/allocator.gni") import("//build/config/compiler/compiler.gni") +if (is_win) { + import("//build/config/win/visual_studio_version.gni") +} + declare_args() { # Provide a way to force disable debugallocation in Debug builds, # e.g. for profiling (it's more rare to profile Debug builds, @@ -23,7 +27,7 @@ group("allocator") { } # This condition expresses the win_use_allocator_shim in the GYP build. - if (is_win && !is_component_build) { + if (is_win && !is_component_build && visual_studio_version != "2015") { public_deps += [ ":allocator_shim" ] } } @@ -35,7 +39,7 @@ group("allocator") { # assumes that the library using it will eventually be linked with # //base/allocator in the default way. Clean this up and delete this. config("allocator_shim_define") { - if (is_win && !is_component_build) { + if (is_win && !is_component_build && visual_studio_version != "2015") { defines = [ "ALLOCATOR_SHIM" ] } } @@ -69,8 +73,6 @@ config("tcmalloc_flags") { # This config and libc modification are only used on Windows. if (is_win) { - import("//build/config/win/visual_studio_version.gni") - config("nocmt") { ldflags = [ "/NODEFAULTLIB:libcmt", @@ -79,7 +81,7 @@ if (is_win) { libs = [ rebase_path("$target_gen_dir/allocator/libcmt.lib") ] } - if (!is_component_build) { + if (!is_component_build && visual_studio_version != "2015") { action("prep_libc") { script = "prep_libc.py" outputs = [ |