From 8aa07683f555dd02e2c7cae2d3e28c53385cc504 Mon Sep 17 00:00:00 2001 From: Alexis Hetu Date: Wed, 2 Aug 2017 17:00:55 -0400 Subject: [PATCH] Attempt to fix the MacOS build MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit On the mac_optional_gpu_tests_rel bot, a -Wall flag cancels out the -Wno-unused-local-typedef warning suppression and causes the build to fail. Attempting to reorder the configs order to solve the issue. Change-Id: Ic790f5cb7803be4749616d826e1368ef76e2c889 Reviewed-on: https://swiftshader-review.googlesource.com/11212 Reviewed-by: Nicolas Capens Reviewed-by: Alexis Hétu Tested-by: Alexis Hétu --- src/swiftshader.gni | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/swiftshader.gni b/src/swiftshader.gni index 333ef80e0..c4292e3f0 100644 --- a/src/swiftshader.gni +++ b/src/swiftshader.gni @@ -36,22 +36,22 @@ configs_to_add += [ template("swiftshader_source_set") { source_set(target_name) { + configs -= configs_to_delete + configs += configs_to_add forward_variables_from(invoker, "*", [ "configs" ]) if (defined(invoker.configs)) { configs += invoker.configs } - configs -= configs_to_delete - configs += configs_to_add } } template("swiftshader_shared_library") { shared_library(target_name) { + configs -= configs_to_delete + configs += configs_to_add forward_variables_from(invoker, "*", [ "configs" ]) if (defined(invoker.configs)) { configs += invoker.configs } - configs -= configs_to_delete - configs += configs_to_add } } -- 2.11.0