commit 8aa07683f555dd02e2c7cae2d3e28c53385cc504
author Alexis Hetu <sugoi@google.com> Wed Aug 02 17:00:55 2017 -0400
committer Alexis Hétu <sugoi@google.com> Wed Aug 02 21:03:28 2017 +0000
tree 87b2fc9857f85e49098cc3921e662fe44d6de7d6
parent c4159a17859541800bc4f9ca1fa5d2a5858276fa

Attempt to fix the MacOS build

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 <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>

src/swiftshader.gni

diff --git a/src/swiftshader.gni b/src/swiftshader.gni
index 333ef80..c4292e3 100644
--- a/src/swiftshader.gni
+++ b/src/swiftshader.gni
@@ -36,22 +36,22 @@
 
 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
   }
 }