|
7 | 7 |
|
8 | 8 | SWIFT_INSTALL="$(dirname$PWD)" |
9 | 9 | SRC_SCRIPTS_DIR="$(realpath$(dirname$0))" |
10 | | -ARCH=`uname` |
| 10 | +UNAME=`uname` |
11 | 11 |
|
12 | 12 | SCRIPTS=~/.gradle/scripts |
13 | 13 |
|
@@ -42,10 +42,10 @@ if [[ ! -f "$GLIBC_MODULEMAP.orig" ]]; then |
42 | 42 | cp"$GLIBC_MODULEMAP""$GLIBC_MODULEMAP.orig" |
43 | 43 | fi&& |
44 | 44 |
|
45 | | -sed -e s@/usr/local/android/ndk/platforms/android-21/arch-arm/@$SWIFT_INSTALL/ndk-android-21@<"$GLIBC_MODULEMAP.orig">"$GLIBC_MODULEMAP"&& |
| 45 | +sed -e"s@/usr/local/android/ndk/platforms/android-21/arch-arm/@$SWIFT_INSTALL/ndk-android-21@"<"$GLIBC_MODULEMAP.orig">"$GLIBC_MODULEMAP"&& |
46 | 46 |
|
47 | 47 | rm -f"$SWIFT_INSTALL/usr/bin/swift"&& |
48 | | -if [["$ARCH"=="Darwin" ]];then |
| 48 | +if [["$UNAME"=="Darwin" ]];then |
49 | 49 | SWIFT="$(xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/bin/swift" |
50 | 50 | else |
51 | 51 | SWIFT="$(which swift)" |
@@ -132,7 +132,7 @@ cat <<SCRIPT >swiftc-android.sh && |
132 | 132 | PLATFORM=\$(uname) |
133 | 133 |
|
134 | 134 | SWIFT_INSTALL="$SWIFT_INSTALL" |
135 | | -export PATH="\$SWIFT_INSTALL/usr/$ARCH:\$SWIFT_INSTALL/usr/bin:\$PATH" |
| 135 | +export PATH="\$SWIFT_INSTALL/usr/$UNAME:\$SWIFT_INSTALL/usr/bin:\$PATH" |
136 | 136 |
|
137 | 137 | if [[ "\$*" =~ " -fileno " ]]; then |
138 | 138 | swift "\$@" || (echo "*** Error executing:\$0\$@" && exit 1) |
@@ -168,9 +168,13 @@ if [[ "\$ARGS" =~ "-emit-executable" ]]; then |
168 | 168 | LINKER_ARGS="-Xlinker -pie" |
169 | 169 | fi |
170 | 170 |
|
171 | | -swiftc -target armv7-none-linux-androideabi\\ |
172 | | - -sdk "\$SWIFT_INSTALL/ndk-android-21" -L "\$SWIFT_INSTALL/usr/$ARCH"\\ |
173 | | -\$LINKER_ARGS\$ARGS || (echo "*** Error executing:\$0\$LINKER_ARGS\$ARGS" && exit 1) |
| 171 | +if [[ "\$ARGS" =~ " -emit-executable " && "\$ARGS" =~ ".so " ]]; then |
| 172 | + ARGS=\$(echo "\$ARGS" | sed -E "s@ (-module-name [^[:space:]]+ )?-emit-executable @ -emit-library @") |
| 173 | +fi |
| 174 | +
|
| 175 | +swiftc -target armv7-none-linux-androideabi -sdk "\$SWIFT_INSTALL/ndk-android-21"\\ |
| 176 | + -L "\$SWIFT_INSTALL/usr/$UNAME" -tools-directory "\$SWIFT_INSTALL/usr/$UNAME"\\ |
| 177 | +\$ARGS || (echo "*** Error executing:\$0\$ARGS" && exit 1) |
174 | 178 |
|
175 | 179 | SCRIPT |
176 | 180 |
|
|
