diff options
Diffstat (limited to 'chromium/build/config/win')
| -rw-r--r-- | chromium/build/config/win/BUILD.gn | 7 | ||||
| -rw-r--r-- | chromium/build/config/win/manifest.gni | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/chromium/build/config/win/BUILD.gn b/chromium/build/config/win/BUILD.gn index 7b44f0e4372..c0758b654af 100644 --- a/chromium/build/config/win/BUILD.gn +++ b/chromium/build/config/win/BUILD.gn @@ -82,6 +82,10 @@ config("compiler") { # Don't look for includes in %INCLUDE%. cflags += [ "/X" ] + # Required to make the 19041 SDK compatible with clang-cl. + # See https://crbug.com/1089996 issue #2 for details. + cflags += [ "/D__WRL_ENABLE_FUNCTION_STATICS__" ] + # Tell clang which version of MSVC to emulate. cflags += [ "-fmsc-version=1916" ] @@ -121,9 +125,6 @@ config("compiler") { if (use_clang_diagnostics_format) { cflags += [ "/clang:-fdiagnostics-format=clang" ] } - - # Clang runtime libraries, such as the sanitizer runtimes, live here. - lib_dirs = [ "$clang_base_path/lib/clang/$clang_version/lib/windows" ] } if (use_lld && !use_thin_lto && (is_clang || !use_goma)) { diff --git a/chromium/build/config/win/manifest.gni b/chromium/build/config/win/manifest.gni index b18a4a14129..e2115083fe5 100644 --- a/chromium/build/config/win/manifest.gni +++ b/chromium/build/config/win/manifest.gni @@ -41,6 +41,12 @@ as_invoker_manifest = "//build/win/as_invoker.manifest" # elevate. require_administrator_manifest = "//build/win/require_administrator.manifest" +# Request the segment heap. See https://crbug.com/1014701 for details. +declare_args() { + enable_segment_heap = false +} +segment_heap_manifest = "//build/win/segment_heap.manifest" + # Construct a target to combine the given manifest files into a .rc file. # # Variables for the windows_manifest template: |