Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit be483cb

Browse files
authored
Make new toolchain work on Linux (#164)
1 parent 51e050a commit be483cb

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

build/config/compiler/BUILD.gn

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -571,19 +571,18 @@ config("runtime_library") {
571571
# check can then be removed. So far, the only target that need x86 don't
572572
# also require C++14.
573573
# Tracked in https://fuchsia.atlassian.net/browse/TO-61
574-
if (is_linux && current_cpu != "x86") {
575-
cflags_cc += [ "-stdlib=libc++" ]
576-
ldflags += [
577-
"-stdlib=libc++",
578-
"-static-libstdc++",
579-
580-
# Remove one the toolchain distribution is fixed
581-
# https://github.com/flutter/flutter/issues/6145
582-
"-Wl,-Bstatic",
583-
"-lc++abi",
584-
"-Wl,-Bdynamic",
585-
"-fuse-ld=lld",
586-
]
574+
if (is_linux) {
575+
if (current_cpu != "x86") {
576+
cflags_cc += [ "-stdlib=libc++" ]
577+
ldflags += [
578+
"-stdlib=libc++",
579+
"-static-libstdc++",
580+
]
581+
} else {
582+
cflags_cc += [ "-stdlib=libstdc++" ]
583+
ldflags += [ "-stdlib=libstdc++" ]
584+
libs += [ "gcc" ]
585+
}
587586
}
588587
}
589588

0 commit comments

Comments
 (0)