StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Link msvcr110.a after mingwex.a"

Browse Source
This commit is contained in:
Treehugger Robot
2018-09-18 05:20:36 +00:00
committed by Gerrit Code Review
parent 6b3cc607f3 e5d974d67a
commit cc737f6fe0
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/stl.go
View File

@@ -213,10 +213,9 @@ func init() {
hostDynamicGccLibs = map[android.OsType][]string{ hostDynamicGccLibs = map[android.OsType][]string{
android.Linux: []string{"-lgcc_s", "-lgcc", "-lc", "-lgcc_s", "-lgcc"}, android.Linux: []string{"-lgcc_s", "-lgcc", "-lc", "-lgcc_s", "-lgcc"},
android.Darwin: []string{"-lc", "-lSystem"}, android.Darwin: []string{"-lc", "-lSystem"},
android.Windows: []string{"-lmsvcr110", "-lmingw32", "-lgcc", "-lmoldname", android.Windows: []string{"-lmingw32", "-lgcc", "-lmoldname", "-lmingwex", "-lmsvcr110",
"-lmingwex", "-lmsvcrt", "-ladvapi32", "-lshell32", "-luser32", "-lmsvcrt", "-ladvapi32", "-lshell32", "-luser32", "-lkernel32", "-lmingw32",
"-lkernel32", "-lmingw32", "-lgcc", "-lmoldname", "-lmingwex", "-lgcc", "-lmoldname", "-lmingwex", "-lmsvcrt"},
"-lmsvcrt"},
} }
hostStaticGccLibs = map[android.OsType][]string{ hostStaticGccLibs = map[android.OsType][]string{
android.Linux: []string{"-Wl,--start-group", "-lgcc", "-lgcc_eh", "-lc", "-Wl,--end-group"}, android.Linux: []string{"-Wl,--start-group", "-lgcc", "-lgcc_eh", "-lc", "-Wl,--end-group"},