Remve unreachable code for -opt, minor bugfix. (#135)

This commit is contained in:
Nikolay Igotti
2016-12-12 16:38:19 +03:00
committed by GitHub
parent 6565a5eb23
commit 240a87d0ac
+5 -3
View File
@@ -9,6 +9,7 @@ fi
declare -a java_args declare -a java_args
declare -a konan_args declare -a konan_args
declare -a clang_args declare -a clang_args
declare -a clang_opt_args
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
@@ -21,7 +22,7 @@ while [ $# -gt 0 ]; do
shift shift
;; ;;
-library) -library)
clang_args=("${libraries[@]}" "$2") clang_args=("${clang_args[@]}" "${libraries[@]}" "$2")
konan_args=("${konan_args[@]}" "$1" "$2") konan_args=("${konan_args[@]}" "$1" "$2")
shift shift
shift shift
@@ -54,6 +55,8 @@ while [ $# -gt 0 ]; do
esac esac
done done
# TODO: support -opt on Linux hosts as well.
clang_opt_args=("-O3" "-flto" "-Wl,-dead_strip")
[ -n "$KONAN_COMPILER" ] || KONAN_COMPILER=org.jetbrains.kotlin.cli.bc.K2NativeKt [ -n "$KONAN_COMPILER" ] || KONAN_COMPILER=org.jetbrains.kotlin.cli.bc.K2NativeKt
[ -n "$JAVACMD" ] || JAVACMD=java [ -n "$JAVACMD" ] || JAVACMD=java
@@ -136,10 +139,9 @@ CLANG="$CLANG_BIN_PATH/clang"
# TODO: Compilation without stdlib.kt.bc doesn't work because 'start' requires stdlib, for example. # TODO: Compilation without stdlib.kt.bc doesn't work because 'start' requires stdlib, for example.
# Probably, we need a .klib compilation mode. # Probably, we need a .klib compilation mode.
# [ -z $NOSTDLIB ] && clang_args=($STDLIB "${clang_args[@]}") # [ -z $NOSTDLIB ] && clang_args=($STDLIB "${clang_args[@]}")
[ "$OPTIMIZE" == "YES" ] && clang_args=("-flto -O3 ${clang_args[@]}") [ "$OPTIMIZE" == "YES" ] && clang_args=("${clang_opt_args[@]} ${clang_args[@]}")
clang_args=($STDLIB "${clang_args[@]}") clang_args=($STDLIB "${clang_args[@]}")
clang_args=($LAUNCHER $START $RUNTIME "${clang_args[@]}") clang_args=($LAUNCHER $START $RUNTIME "${clang_args[@]}")
clang_args=("${clang_args[@]} $CLANG_PLATFORM_ARGS") clang_args=("${clang_args[@]} $CLANG_PLATFORM_ARGS")
$CLANG $KTBC_NAME -o $OUTPUT_NAME ${clang_args[@]} $CLANG $KTBC_NAME -o $OUTPUT_NAME ${clang_args[@]}