From f4219caa28329cd43c9acaa43ab80bb2e1c1ce9a Mon Sep 17 00:00:00 2001
From: Seth Goings <seth.goings@readytalk.com>
Date: Wed, 23 Jul 2014 17:26:48 -0600
Subject: [PATCH] Set up bootclasspath on javacompile targets

---
 build.gradle | 9 ++++++++-
 makefile     | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index e2c3157e99..989277a0bc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,6 +28,10 @@ artifactory {
       username = System.env.BINTRAY_USER
       password = System.env.BINTRAY_API_KEY
     }
+
+    defaults {
+      //publications('linux-x86_64')
+    }
   }
 }
 
@@ -44,7 +48,10 @@ tasks.withType(JavaCompile) {
   sourceCompatibility = "1.6"
   targetCompatibility = "1.6"
 
-  options.encoding = "UTF-8"
+  options.with {
+    encoding = "UTF-8"
+    bootClasspath = sourceSets.main.output.classesDir
+  }
 }
 
 sourceSets {
diff --git a/makefile b/makefile
index 6d1b3477c8..77b3fcaf96 100755
--- a/makefile
+++ b/makefile
@@ -1587,7 +1587,6 @@ $(classpath-build)/%.class: $(classpath-src)/%.java
 
 $(classpath-dep): $(classpath-sources) $(classpath-jar-dep)
 	@echo "compiling classpath classes"
-	@echo $(boot-classpath)
 	@mkdir -p $(classpath-build)
 	classes="$(shell $(MAKE) -s --no-print-directory build=$(build) \
 		$(classpath-classes))"; if [ -n "$${classes}" ]; then \