azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MinGW] remove obsolete flag

Browse Source 
See https://github.com/msys2/MINGW-packages/issues/5321
This commit is contained in:
Sergey Bogolepov
2020-11-30 18:06:15 +07:00
committed by Stanislav Erokhin
parent 87e4bbe0f6
commit 14617e2fe2
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/konan/konan.properties
+2 -2
View File
@@ -703,7 +703,7 @@ clangNooptFlags.mingw_x64 = -O1
linkerNoDebugFlags.mingw_x64 = -Wl,-S linkerNoDebugFlags.mingw_x64 = -Wl,-S
linkerDynamicFlags.mingw_x64 = -shared linkerDynamicFlags.mingw_x64 = -shared
linkerKonanFlags.mingw_x64 =-static-libgcc -static-libstdc++ \ linkerKonanFlags.mingw_x64 =-static-libgcc -static-libstdc++ \
-Xclang -flto-visibility-public-std -Wl,--dynamicbase \ -Wl,--dynamicbase \
-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic \ -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic \
-Wl,--defsym,__cxa_demangle=Konan_cxa_demangle -Wl,--defsym,__cxa_demangle=Konan_cxa_demangle
linkerOptimizationFlags.mingw_x64 = -Wl,--gc-sections linkerOptimizationFlags.mingw_x64 = -Wl,--gc-sections
@@ -741,7 +741,7 @@ clangNooptFlags.mingw_x86 = -O1
linkerNoDebugFlags.mingw_x86 = -Wl,-S linkerNoDebugFlags.mingw_x86 = -Wl,-S
linkerDynamicFlags.mingw_x86 = -shared linkerDynamicFlags.mingw_x86 = -shared
linkerKonanFlags.mingw_x86 = -static-libgcc -static-libstdc++ \ linkerKonanFlags.mingw_x86 = -static-libgcc -static-libstdc++ \
-Xclang -flto-visibility-public-std -Wl,--dynamicbase \ -Wl,--dynamicbase \
-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic \ -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic \
-Wl,--defsym,___cxa_demangle=_Konan_cxa_demangle -Wl,--defsym,___cxa_demangle=_Konan_cxa_demangle
mimallocLinkerDependencies.mingw_x86 = -lbcrypt mimallocLinkerDependencies.mingw_x86 = -lbcrypt
kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+2 -4
View File
@@ -76,7 +76,7 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
} }
private val specificClangArgs: List<String> = when (target) { private val specificClangArgs: List<String> = when (target) {
KonanTarget.LINUX_X64 -> listOf() KonanTarget.LINUX_X64 -> emptyList()
KonanTarget.LINUX_ARM32_HFP -> listOf( KonanTarget.LINUX_ARM32_HFP -> listOf(
"-mfpu=vfp", "-mfloat-abi=hard", "-mfpu=vfp", "-mfloat-abi=hard",
@@ -100,9 +100,7 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
"-I$absoluteTargetSysRoot/usr/include/c++/4.9.4/mipsel-unknown-linux-gnu" "-I$absoluteTargetSysRoot/usr/include/c++/4.9.4/mipsel-unknown-linux-gnu"
) )
KonanTarget.MINGW_X64, KonanTarget.MINGW_X86 -> listOf( KonanTarget.MINGW_X64, KonanTarget.MINGW_X86 -> emptyList()
"-Xclang", "-flto-visibility-public-std"
)
KonanTarget.MACOS_X64 -> listOf( KonanTarget.MACOS_X64 -> listOf(
"-mmacosx-version-min=$osVersionMin" "-mmacosx-version-min=$osVersionMin"