Merge "Pass -static-libgcc to Windows link commands" am: a60e81853f
am: 077a726afb
am: 22751cb748
Change-Id: Ic0db7fc84c323b97406968bfb575f6b8f86ce87f
This commit is contained in:
committed by
android-build-merger
commit
4c08bad3ff
@@ -73,6 +73,7 @@ var (
|
|||||||
"-m32",
|
"-m32",
|
||||||
"-Wl,--large-address-aware",
|
"-Wl,--large-address-aware",
|
||||||
"-L${WindowsGccRoot}/${WindowsGccTriple}/lib32",
|
"-L${WindowsGccRoot}/${WindowsGccTriple}/lib32",
|
||||||
|
"-static-libgcc",
|
||||||
}
|
}
|
||||||
windowsX86ClangLdflags = append(ClangFilterUnknownCflags(windowsX86Ldflags), []string{
|
windowsX86ClangLdflags = append(ClangFilterUnknownCflags(windowsX86Ldflags), []string{
|
||||||
"-B${WindowsGccRoot}/${WindowsGccTriple}/bin",
|
"-B${WindowsGccRoot}/${WindowsGccTriple}/bin",
|
||||||
@@ -86,6 +87,7 @@ var (
|
|||||||
"-m64",
|
"-m64",
|
||||||
"-L${WindowsGccRoot}/${WindowsGccTriple}/lib64",
|
"-L${WindowsGccRoot}/${WindowsGccTriple}/lib64",
|
||||||
"-Wl,--high-entropy-va",
|
"-Wl,--high-entropy-va",
|
||||||
|
"-static-libgcc",
|
||||||
}
|
}
|
||||||
windowsX8664ClangLdflags = append(ClangFilterUnknownCflags(windowsX8664Ldflags), []string{
|
windowsX8664ClangLdflags = append(ClangFilterUnknownCflags(windowsX8664Ldflags), []string{
|
||||||
"-B${WindowsGccRoot}/${WindowsGccTriple}/bin",
|
"-B${WindowsGccRoot}/${WindowsGccTriple}/bin",
|
||||||
|
Reference in New Issue
Block a user