azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nikolay Igotti
2016-12-12 16:38:19 +03:00
committed by GitHub
parent 6565a5eb23
commit 240a87d0ac
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/konanc
+17 -15
View File
@@ -1,14 +1,15 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
JAVACMD="$JAVA_HOME/bin/java" JAVACMD="$JAVA_HOME/bin/java"
else else
JAVACMD=java JAVACMD=java
fi 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
@@ -63,9 +66,9 @@ done
findHome() { findHome() {
local source="${BASH_SOURCE[0]}" local source="${BASH_SOURCE[0]}"
while [ -h "$source" ] ; do while [ -h "$source" ] ; do
local linked="$(readlink "$source")" local linked="$(readlink "$source")"
local dir="$(cd -P $(dirname "$source") && cd -P $(dirname "$linked") && pwd)" local dir="$(cd -P $(dirname "$source") && cd -P $(dirname "$linked") && pwd)"
source="$dir/$(basename "$linked")" source="$dir/$(basename "$linked")"
done done
(cd -P "$(dirname "$source")/.." && pwd) (cd -P "$(dirname "$source")/.." && pwd)
} }
@@ -98,16 +101,16 @@ konan_args=("-runtime" $RUNTIME "${konan_args[@]}")
if [ -z $OUTPUT_NAME ] ; then if [ -z $OUTPUT_NAME ] ; then
if [ -z $NOLINK ] ; then if [ -z $NOLINK ] ; then
OUTPUT_NAME="program.kexe" OUTPUT_NAME="program.kexe"
KTBC_NAME="program.kt.bc" KTBC_NAME="program.kt.bc"
else else
KTBC_NAME="program.kt.bc" KTBC_NAME="program.kt.bc"
fi fi
else else
if [ -z $NOLINK ] ; then if [ -z $NOLINK ] ; then
KTBC_NAME="${OUTPUT_NAME}.kt.bc" KTBC_NAME="${OUTPUT_NAME}.kt.bc"
else else
KTBC_NAME="${OUTPUT_NAME}" KTBC_NAME="${OUTPUT_NAME}"
fi fi
fi fi
@@ -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[@]}