Commit8a48d34

authored

Merge branch 'incoming' into master

2 parentseca2668 +3ac7b90 commit8a48d34Copy full SHA for 8a48d34

File tree

-0

lines changed

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ if [[ "\$*" =~ " -fileno " ]]; then`
`139`	`139`	`exit$?`
`140`	`140`	`fi`
`141`	`141`
	`142`	`+# remove whatever target SwiftPM has supplied`
`142`	`143`	`ARGS=\$(echo "\$" \| sed -E "s@-target [^[:space:]]+ -sdk /[^[:space:]] (-F /[^[:space:]]* )?@@")`
`143`	`144`
`144`	`145`	`if [[\$PLATFORM == "Darwin" ]]; then`
`@@ -172,6 +173,7 @@ if [[ "\$ARGS" =~ " -emit-executable " && "\$ARGS" =~ ".so " ]]; then`
`172`	`173`	`ARGS=\$(echo "\$ARGS" \| sed -E "s@ (-module-name [^[:space:]]+ )?-emit-executable @ -emit-library @")`
`173`	`174`	`fi`
`174`	`175`
	`176`	`+# compile using toolchain's swiftc with Android target`
`175`	`177`	`swiftc -target armv7-none-linux-androideabi -sdk "\$SWIFT_INSTALL/ndk-android-21"\\`
`176`	`178`	`-L "\$SWIFT_INSTALL/usr/$UNAME" -tools-directory "\$SWIFT_INSTALL/usr/$UNAME"\\`
`177`	`179`	`\$ARGS \|\| (echo "*** Error executing:\$0\$ARGS" && exit 1)`

Comments

(0)