From d56f8d2e050140d4f0bd5e4b33c9eabbfafaabef Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Tue, 26 Feb 2019 09:55:23 +0000 Subject: [PATCH] Remove Chrome-specific configs for GLFW and GLM BUG=chromium:935641 BUG=chromium:935704 Change-Id: I3ebe97beb330ff8e446a54c218f4c34001259b33 Reviewed-on: https://dawn-review.googlesource.com/c/5061 Reviewed-by: Corentin Wallez Commit-Queue: Corentin Wallez --- third_party/BUILD.gn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index bc1d359f67..a745ffbe6c 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -225,6 +225,9 @@ config("glfw_public") { static_library("glfw") { public_configs = [ ":glfw_public" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + if (is_msvc) { # nonstandard extension, function/data pointer conversion in expression cflags_c = [ "/wd4152" ] @@ -335,6 +338,9 @@ if (dawn_standalone) { include_dirs = [ "glm" ] } source_set("glm") { + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + public_configs = [ ":glm_public_config" ] # GLM is header only but has too many files to list them. }