samples, concurrent: Download dependencies before building
This commit is contained in:
@@ -14,7 +14,6 @@ konanArtifacts {
|
||||
}
|
||||
|
||||
task compileCpp(type: Exec) {
|
||||
dependsOn 'genMessageChannelInteropStubs'
|
||||
workingDir project.getProjectDir()
|
||||
commandLine './buildCpp.sh'
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ $DIR/buildCpp.sh
|
||||
cinterop -def $DIR/src/main/c_interop/MessageChannel.def -copt "-I$DIR/src/main/cpp" -target $TARGET \
|
||||
-o $DIR/build/c_interop/MessageChannel || exit 1
|
||||
|
||||
konanc $DIR/src/main/kotlin/Concurrent.kt -library $DIR/build/c_interop/MessageChannel \
|
||||
konanc $DIR/src/main/kotlin/Concurrent.kt -target $TARGET -library $DIR/build/c_interop/MessageChannel \
|
||||
-nativelibrary $DIR/build/clang/MessageChannel.bc -o $DIR/build/bin/Concurrent || exit 1
|
||||
|
||||
echo "Artifact path is $DIR/build/bin/Concurrent.kexe"
|
||||
|
||||
@@ -12,6 +12,9 @@ case "$OSTYPE" in
|
||||
esac
|
||||
fi
|
||||
|
||||
# Ensure that C compiler for the target is available.
|
||||
konanc --check_dependencies -target $TARGET || exit 1
|
||||
|
||||
CLANG_linux=$DEPS/clang-llvm-3.9.0-linux-x86-64/bin/clang++
|
||||
CLANG_macbook=$DEPS/clang-llvm-3.9.0-darwin-macos/bin/clang++
|
||||
|
||||
|
||||
Reference in New Issue
Block a user