No colon cinterop flags (#428)

* Taught cinterop a 'host' target.

* Last minute switch from -foo:bar flags to -foo bar flags in cinterop tool.
This commit is contained in:
alexander-gorshenev
2017-03-31 10:20:29 +03:00
committed by Nikolay Igotti
parent b2a57e7cb3
commit c9c9aee7bb
11 changed files with 63 additions and 66 deletions
+12 -12
View File
@@ -37,13 +37,13 @@ while [ $# -gt 0 ]; do
java_args=("${java_args[@]}" "${1:2}")
shift
;;
-o:*)
OUTPUT_FILE_NAME="${1:3}"
shift
-o)
OUTPUT_FILE_NAME="$2"
shift 2
;;
-target:*)
TARGET="${1:8}"
shift
-target)
TARGET="$2"
shift 2
;;
*)
interop_args=("${interop_args[@]}" "$1")
@@ -76,22 +76,22 @@ HELPERS_JAR="${KONAN_HOME}/konan/lib/helpers.jar"
INTEROP_CLASSPATH="$STUB_GENERATOR_JAR:$KOTLIN_JAR:$INTEROP_INDEXER_JAR:$INTEROP_RUNTIME_JAR:$HELPERS_JAR"
INTEROP_TOOL=org.jetbrains.kotlin.native.interop.gen.jvm.MainKt
FLAVOR_ARG=-flavor:native
FLAVOR_ARG="-flavor native"
GENERATED_DIR="$OUTPUT_FILE_NAME-build/kotlin"
GENERATED_ARG="-generated:$GENERATED_DIR"
GENERATED_ARG="-generated $GENERATED_DIR"
NATIVES_DIR="$OUTPUT_FILE_NAME-build/natives"
NATIVES_ARG="-natives:$NATIVES_DIR"
NATIVES_ARG="-natives $NATIVES_DIR"
CSTUBSNAME=cstubs
CSTUBSNAME_ARG="-cstubsname:$CSTUBSNAME"
CSTUBSNAME_ARG="-cstubsname $CSTUBSNAME"
LIBCLANG_DISABLE_CRASH_RECOVERY=1 \
LD_LIBRARY_PATH=${NATIVE_LIB} \
$JAVACMD $JAVA_OPTS ${java_args[@]} \
-cp $INTEROP_CLASSPATH \
$INTEROP_TOOL \
"$GENERATED_ARG" "$NATIVES_ARG" "$CSTUBSNAME_ARG" \
$FLAVOR_ARG -target:$TARGET "${interop_args[@]}" \
$GENERATED_ARG $NATIVES_ARG $CSTUBSNAME_ARG \
$FLAVOR_ARG -target $TARGET "${interop_args[@]}" \
|| exit 1
# Stubs may be rather big, so we may need more heap space.