From b8ead53487a2e524f78d8884cc0ecd8f4b166502 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Fri, 23 Jun 2017 18:00:54 +0700 Subject: [PATCH] build: Don't run cross_dist in gradle-plugin build --- samples/README.md | 4 +++- tools/kotlin-native-gradle-plugin/build.gradle | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/samples/README.md b/samples/README.md index 926885b8d88..cde12e75192 100644 --- a/samples/README.md +++ b/samples/README.md @@ -5,7 +5,9 @@ built using either command line tools (via `build.sh` script presented in each s See `README.md` in sample directories to learn more about specific samples and the building process. **Note**: If the samples are built from a source tree (not from a distribution archive) the compiler and the gradle -plugin built from the sources are used. +plugin built from the sources are used. So one must build the compiler by running `./gradlew cross_dist` from the +Kotlin/Native root directory before building samples (see +[README.md](https://github.com/JetBrains/kotlin-native/blob/master/README.md) for details). One may also build all the samples with one command. To build them using the command line tools run: diff --git a/tools/kotlin-native-gradle-plugin/build.gradle b/tools/kotlin-native-gradle-plugin/build.gradle index 22793a64ce9..734cc8d4bd1 100644 --- a/tools/kotlin-native-gradle-plugin/build.gradle +++ b/tools/kotlin-native-gradle-plugin/build.gradle @@ -56,7 +56,6 @@ dependencies { jar { dependsOn(':tools:helpers:jar') - dependsOn(':cross_dist') from (rootProject.findProject(':tools:helpers').sourceSets.main.output) from (rootProject.findProject(':shared').sourceSets.main.output) }