maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

gn build: Fix some tests for host_os to instead check current_os. 

Should fix Windows build:
http://45.33.8.238/win/55809/step_4.txt
This commit is contained in:
Peter Collingbourne 2022-04-06 15:40:09 -07:00
parent 5749a261c5
commit 38f9200945
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
llvm/utils/gn/build/BUILD.gn
View File

@ -59,7 +59,7 @@ config("compiler_defaults") {
assert(symbol_level == 0 || symbol_level == 1 || symbol_level == 2, assert(symbol_level == 0 || symbol_level == 1 || symbol_level == 2,
"Unexpected symbol_level") "Unexpected symbol_level")
if (host_os != "win") { if (current_os != "win") {
if (symbol_level == 2) { if (symbol_level == 2) {
cflags += [ "-g" ] cflags += [ "-g" ]
@ -69,7 +69,7 @@ config("compiler_defaults") {
# people doing symbol_level=2 want to run a debugger (since # people doing symbol_level=2 want to run a debugger (since
# symbol_level=2 isn't the default). So this seems like the right # symbol_level=2 isn't the default). So this seems like the right
# tradeoff. # tradeoff.
if (host_os != "mac" && use_lld) { if (current_os != "mac" && use_lld) {
cflags += [ "-ggnu-pubnames" ] # PR34820 cflags += [ "-ggnu-pubnames" ] # PR34820
ldflags += [ "-Wl,--gdb-index" ] ldflags += [ "-Wl,--gdb-index" ]
@ -168,7 +168,7 @@ config("compiler_defaults") {
} }
# Warning setup. # Warning setup.
if (host_os == "win" && !is_clang) { if (current_os == "win" && !is_clang) {
cflags += [ cflags += [
# Suppress ''modifier' : used more than once' (__forceinline and inline). # Suppress ''modifier' : used more than once' (__forceinline and inline).
"-wd4141", "-wd4141",
@ -192,7 +192,7 @@ config("compiler_defaults") {
"-wd4805", "-wd4805",
] ]
} else { } else {
if (host_os == "win") { if (current_os == "win") {
cflags += [ "/W4" ] cflags += [ "/W4" ]
} else { } else {
cflags += [ cflags += [
@ -247,7 +247,7 @@ config("compiler_defaults") {
} }
# On Windows, the linker is not invoked through the compiler driver. # On Windows, the linker is not invoked through the compiler driver.
if (use_lld && host_os != "win") { if (use_lld && current_os != "win") {
ldflags += [ "-fuse-ld=lld" ] ldflags += [ "-fuse-ld=lld" ]
} }
@ -267,7 +267,7 @@ config("compiler_defaults") {
"-fprofile-instr-generate=" + "-fprofile-instr-generate=" +
rebase_path("$root_build_dir/profiles/%4m.profraw"), rebase_path("$root_build_dir/profiles/%4m.profraw"),
] ]
if (host_os != "win") { if (current_os != "win") {
ldflags += [ "-fprofile-instr-generate" ] ldflags += [ "-fprofile-instr-generate" ]
} }
} }
@ -365,7 +365,7 @@ config("compiler_defaults") {
cflags += [ "-flto=thin" ] cflags += [ "-flto=thin" ]
if (host_os == "win") { if (current_os == "win") {
ldflags += [ ldflags += [
"/opt:lldlto=" + lto_opt_level, "/opt:lldlto=" + lto_opt_level,
"/opt:lldltojobs=" + max_jobs_per_lto_link, "/opt:lldltojobs=" + max_jobs_per_lto_link,
@ -384,7 +384,7 @@ config("compiler_defaults") {
config("no_exceptions") { config("no_exceptions") {
cflags_cc = [] cflags_cc = []
if (host_os != "win") { if (current_os != "win") {
cflags_cc += [ "-fno-exceptions" ] cflags_cc += [ "-fno-exceptions" ]
} }
cflags_objcc = cflags_cc cflags_objcc = cflags_cc
@ -434,7 +434,7 @@ config("lld_code") {
} }
config("clang_code") { config("clang_code") {
if (host_os != "win") { if (current_os != "win") {
cflags = [ "-fno-strict-aliasing" ] cflags = [ "-fno-strict-aliasing" ]
} }
include_dirs = [ include_dirs = [
@ -472,7 +472,7 @@ config("crt_code") {
} }
config("lldb_code") { config("lldb_code") {
if (host_os != "win") { if (current_os != "win") {
cflags = [ "-fno-strict-aliasing" ] cflags = [ "-fno-strict-aliasing" ]
} }
include_dirs = [ include_dirs = [