Skip to content

Commit 78cf6d8

Browse files
Revert "Remove ldflag no longer necessary with the new toolchain. (flutter#137)" (#139)
This reverts commit 92c86d0. Revert "Use -nostdinc++ on Android since those headers need to be picked up from the NDK. (flutter#136)" This reverts commit 634be5f. Because buildtools has not been rolled, these interfer with rolling the Windows GN change.
1 parent 58918cd commit 78cf6d8

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

build/config/compiler/BUILD.gn

+1-6
Original file line numberDiff line numberDiff line change
@@ -394,12 +394,6 @@ config("compiler") {
394394
# Android-specific flags setup.
395395
# -----------------------------
396396
if (is_android) {
397-
# Use stdinc++ from the NDK.
398-
cflags += [
399-
"-nostdinc++"
400-
]
401-
402-
# Common Android flags
403397
cflags += [
404398
"-ffunction-sections",
405399
"-funwind-tables",
@@ -583,6 +577,7 @@ config("runtime_library") {
583577
# Remove one the toolchain distribution is fixed
584578
# https://github.com/flutter/flutter/issues/6145
585579
"-Wl,-Bstatic",
580+
"-lc++abi",
586581
"-Wl,-Bdynamic",
587582
"-fuse-ld=lld",
588583
]

0 commit comments

Comments
 (0)