Commit1c67d9f

committed

Merge branch 'incoming'

2 parentscb1b294 +a473bf7 commit1c67d9fCopy full SHA for 1c67d9f

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,9 +165,9 @@ if [[ "$UNAME" == "Darwin" ]]; then`
`165`	`165`	`fi`
`166`	`166`
`167`	`167`	`# for compatability with V3 Package.swift for now`
`168`		`-#if [[ "\$ARGS" =~ " -emit-executable " && "\$ARGS" =~ ".so " ]]; then`
`169`		`-# ARGS=\$(echo "\$ARGS" \| sed -E "s@ (-module-name [^[:space:]]+ )?-emit-executable @ -emit-library @")`
`170`		`-#fi`
	`168`	`+if [[ "\$ARGS" =~ " -emit-executable " && "\$ARGS" =~ ".so " ]]; then`
	`169`	`+ ARGS=\$(echo "\$ARGS" \| sed -E "s@ (-module-name [^[:space:]]+ )?-emit-executable @ -emit-library @")`
	`170`	`+fi`
`171`	`171`
`172`	`172`	`# compile using toolchain's swiftc with Android target`
`173`	`173`	`swiftc -target armv7-none-linux-androideabi -sdk "\$SWIFT_INSTALL/ndk-android-21"\\`

Comments

(0)