From 8a33e1d6b207a86ce03627b7adeb398fd8bcb1d1 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 27 Nov 2012 13:32:58 +0400 Subject: [PATCH] Fix kotlinc on Cygwin Do not convert KOTLIN_HOME back to unix format, since it's passed to Win version of Java, which doesn't understand /cygdrive/.. paths #KT-3049 Fixed --- compiler/cli/bin/kotlinc-js | 1 - compiler/cli/bin/kotlinc-jvm | 1 - 2 files changed, 2 deletions(-) diff --git a/compiler/cli/bin/kotlinc-js b/compiler/cli/bin/kotlinc-js index 1d188802139..b07ba002566 100755 --- a/compiler/cli/bin/kotlinc-js +++ b/compiler/cli/bin/kotlinc-js @@ -36,7 +36,6 @@ KOTLIN_HOME=`cd "$KOTLIN_HOME"/..; pwd` # Remove spaces from KOTLIN_HOME on windows if $cygwin; then KOTLIN_HOME=`cygpath --windows --short-name "$KOTLIN_HOME"` - KOTLIN_HOME=`cygpath --unix "$KOTLIN_HOME"` fi [ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx256M -Xms32M" diff --git a/compiler/cli/bin/kotlinc-jvm b/compiler/cli/bin/kotlinc-jvm index 489aac1a5f0..1e1c7e82299 100755 --- a/compiler/cli/bin/kotlinc-jvm +++ b/compiler/cli/bin/kotlinc-jvm @@ -36,7 +36,6 @@ KOTLIN_HOME=`cd "$KOTLIN_HOME"/..; pwd` # Remove spaces from KOTLIN_HOME on windows if $cygwin; then KOTLIN_HOME=`cygpath --windows --short-name "$KOTLIN_HOME"` - KOTLIN_HOME=`cygpath --unix "$KOTLIN_HOME"` fi [ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx256M -Xms32M"