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

Moved link args computation to the root build.gradle.

Browse Source 
Pass the link args to konanc.
This commit is contained in:
Alexander Gorshenev
2016-12-07 13:11:40 +03:00
committed by alexander-gorshenev
parent f79b0bdf6a
commit b04c52664e
3 changed files with 50 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/konanc
+2 -2
View File
@@ -131,7 +131,7 @@ START="${KONAN_HOME}/lib/start.kt.bc"
CLANG_PLATFORM_ARGS="FILTER_CLANG_PLATFORM_ARGS"
CLANG_BIN_PATH="FILTER_CLANG_BIN_PATH"
CLANG="$CLANG_BIN_PATH/clang++"
CLANG="$CLANG_BIN_PATH/clang"
# TODO: Compilation without stdlib.kt.bc doesn't work because 'start' requires stdlib, for example.
# Probably, we need a .klib compilation mode.
@@ -139,7 +139,7 @@ CLANG="$CLANG_BIN_PATH/clang++"
[ "$OPTIMIZE" == "YES" ] && clang_args=("-flto -O3 ${clang_args[@]}")
clang_args=($STDLIB "${clang_args[@]}")
clang_args=($LAUNCHER $START $RUNTIME "${clang_args[@]}")
clang_args=("${clang_args[@]} -xc $CLANG_PLATFORM_ARGS")
clang_args=("${clang_args[@]} $CLANG_PLATFORM_ARGS")
$CLANG $KTBC_NAME -o $OUTPUT_NAME ${clang_args[@]}