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

Minor changes after code review.

Browse Source
This commit is contained in:
Alexander Gorshenev
2016-12-06 16:19:46 +03:00
committed by alexander-gorshenev
parent c84fe7fd85
commit 28f683bf09
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+2 -2
View File
@@ -38,7 +38,7 @@ allprojects {
ext.clangArgs << "-B$binDir" ext.clangArgs << "-B$binDir"
ext.clangPath << binDir ext.clangPath << binDir
ext.jvmArgs=["-ea"] ext.jvmArgs = ["-ea"]
convention.plugins.execClang = new org.jetbrains.kotlin.ExecClang(project) convention.plugins.execClang = new org.jetbrains.kotlin.ExecClang(project)
@@ -113,7 +113,7 @@ task dist_compiler(type: Copy) {
} }
from(file('cmd')) { from(file('cmd')) {
fileMode(0775) fileMode(0755)
include('konanc') include('konanc')
include('kotlinc-native') include('kotlinc-native')
cmd/konanc
+1 -1
View File
@@ -134,7 +134,7 @@ CLANG="$CLANG_BIN_PATH/clang++"
# [ -z $NOSTDLIB ] && clang_args=($STDLIB "${clang_args[@]}") # [ -z $NOSTDLIB ] && clang_args=($STDLIB "${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[@]}" "-xc $CLANG_PLATFORM_ARGS") clang_args=("${clang_args[@]} -xc $CLANG_PLATFORM_ARGS")
$CLANG $KTBC_NAME -o $OUTPUT_NAME ${clang_args[@]} $CLANG $KTBC_NAME -o $OUTPUT_NAME ${clang_args[@]}