Fixed official chromium build on Linux
A warning treated as an error was causing the
official build to fail. Added -Wno-unused-result
to the LLVM build file to solve the issue.
Also ran 'git cl format' on the BUILD.gn files
to fix all formatting issues.
Change-Id: I235c7d9d3e60f788e1dc694a40991c214e6c77e3
Reviewed-on: https://swiftshader-review.googlesource.com/8110
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
diff --git a/BUILD.gn b/BUILD.gn
index e6e7a8e..ae6087e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -15,18 +15,18 @@
config("swiftshader_config") {
if (is_win) {
cflags = [
- "/GS", # Detects some buffer overruns
+ "/GS", # Detects some buffer overruns
"/Zc:wchar_t",
"/D_CRT_SECURE_NO_DEPRECATE",
"/DNOMINMAX",
"/D_WINDLL",
"/EHsc",
"/nologo",
- "/Gd", # Default calling convention
+ "/Gd", # Default calling convention
]
if (is_debug) {
- cflags += [ "/RTC1" ] # Run-Time Error Checks
+ cflags += [ "/RTC1" ] # Run-Time Error Checks
} else {
cflags += [ "/DANGLE_DISABLE_TRACE" ]
}
@@ -35,7 +35,7 @@
if (is_debug) {
cflags += [ "-g" ]
- } else { # Release
+ } else { # Release
# All Release builds use function/data sections to make the shared libraries smaller
cflags += [
"-ffunction-sections",
@@ -47,17 +47,17 @@
# Choose the right Release architecture
if (target_cpu == "x64") {
cflags += [ "-march=core2" ]
- } else { # 32
+ } else { # 32
cflags += [ "-march=i686" ]
}
}
- if (target_cpu == "x64") { # 64 bit version
+ if (target_cpu == "x64") { # 64 bit version
cflags += [
"-m64",
"-fPIC",
]
- } else { # 32 bit version
+ } else { # 32 bit version
cflags += [ "-m32" ]
}
}
@@ -76,4 +76,4 @@
data_deps = [
"tests/unittests:swiftshader_unittests",
]
-}
\ No newline at end of file
+}