Skip to content

S
swiftshader
Commit 2c85340d by Alexis Hetu Committed by Alexis Hétu
Options

Fix ignored gn local variable

The current way "use_subzero" was used seems to fail when compiling with goma (I don't see why, honestly). Anyway, most build configuration related booleans are declared in a declare_args() section, so I moved the setting there, which will hopefully solve the issue. Change-Id: I063d9938d04bfdf8140878a740f3710309f8bf1e Reviewed-on: https://swiftshader-review.googlesource.com/8714Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent cd4fe6aa
Showing with 7 additions and 5 deletions
src/Reactor/BUILD.gn
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
declare_args() {
# Currently, Subzero is not used by default
# LLVM is still the default backend
use_swiftshader_with_subzero = false
}
# Need a separate config to ensure the warnings are added to the end. # Need a separate config to ensure the warnings are added to the end.
config("swiftshader_subzero_common_private_config") { config("swiftshader_subzero_common_private_config") {
defines = [ defines = [
...@@ -242,11 +248,7 @@ source_set("swiftshader_reactor") { ...@@ -242,11 +248,7 @@ source_set("swiftshader_reactor") {
"Routine.cpp", "Routine.cpp",
] ]
# Currently, Subzero will only be used on Windows if (use_swiftshader_with_subzero) {
# LLVM will be used on Linux and MacOS
use_subzero = false
if (use_subzero) {
deps += [ ":swiftshader_subzero" ] deps += [ ":swiftshader_subzero" ]
sources += [ sources += [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment