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

Fix iphone build (#465)

Browse Source
This commit is contained in:
Nikolay Igotti
2017-04-10 16:14:53 +03:00
committed by GitHub
parent b54ff99fc7
commit 4f13da844f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/konan.properties
+2 -2
View File
@@ -40,10 +40,10 @@ sysRoot.osx-ios = target-sysroot-1-darwin-macos
targetSysRoot.osx-ios = target-sysroot-2-darwin-ios targetSysRoot.osx-ios = target-sysroot-2-darwin-ios
libffiDir.osx-ios = libffi-3.2.1-2-darwin-ios libffiDir.osx-ios = libffi-3.2.1-2-darwin-ios
llvmHome.osx-ios = clang-llvm-3.9.0-darwin-macos llvmHome.osx-ios = clang-llvm-3.9.0-darwin-macos
llvmLlcFlags.osx-ios = -mtriple=arm64-apple-ios5.0.0 --disable-fp-elim llvmLlcFlags.osx-ios = -mtriple=arm64-apple-ios8.0.0 --disable-fp-elim
linkerKonanFlags.osx-ios = -lc++ linkerKonanFlags.osx-ios = -lc++
linkerOptimizationFlags.osx-ios = -dead_strip linkerOptimizationFlags.osx-ios = -dead_strip
osVersionMin.osx-ios = -iphoneos_version_min 5.0.0 osVersionMin.osx-ios = -iphoneos_version_min 8.0.0
entrySelector.osx-ios = -alias _Konan_main _main entrySelector.osx-ios = -alias _Konan_main _main
dependencies.osx-ios = target-sysroot-1-darwin-macos \ dependencies.osx-ios = target-sysroot-1-darwin-macos \
libffi-3.2.1-2-darwin-ios \ libffi-3.2.1-2-darwin-ios \
build.gradle
+3 -2
View File
@@ -83,10 +83,11 @@ void setupCompilationFlags() {
["host": ["host":
["--sysroot=$hostSysrootDir", "-mmacosx-version-min=$minMacOsVersion"], ["--sysroot=$hostSysrootDir", "-mmacosx-version-min=$minMacOsVersion"],
"iphone": "iphone":
["-stdlib=libc++", "-arch", "arm64", "-isysroot", "$iphoneSysrootDir"], ["-stdlib=libc++", "-arch", "arm64", "-isysroot", "$iphoneSysrootDir",
"-miphoneos-version-min=8.0.0"]
// TODO: re-enable after simulator sysroot is available in the dependencies // TODO: re-enable after simulator sysroot is available in the dependencies
// "iphone_sim": // "iphone_sim":
// ["-stdlib=libc++", "-isysroot", "$iphoneSimSysrootDir"], // ["-stdlib=libc++", "-isysroot", "$iphoneSimSysrootDir", "-miphoneos-version-min=8.0.0"],
] ]
} }
ext.targetList = ext.targetArgs.keySet() as List ext.targetList = ext.targetArgs.keySet() as List