From 4fbc50cb299e2e9334ebbfabc6ebe32718130b6b Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 21 Sep 2013 06:11:58 +0200
Subject: Fix build issue on OSX w/ Java6. target.rt.jar is not enough for
 compile-time classes (host), since com.sun.tools.doclets.Taglet is required.

---
 make/build.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/make/build.xml b/make/build.xml
index 2d1ec43..e22a062 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -704,7 +704,7 @@
     <!-- Build GlueGen using the generated Java files along with the
       - original source. -->
 
-    <!--compile gluegen-rt first-->
+    <!-- Compile gluegen-rt first -->
     <javac destdir="${classes}"
            includeAntRuntime="false"
            includes="${gluegen-rt.classes} ${jogamp.common.classes}"
@@ -720,7 +720,13 @@
       <classpath refid="cc_gluegen.classpath" />
     </javac>
 
-    <!--compile gluegen (compile time) -->
+    <!-- Compile gluegen (compile time).
+
+         Uses host.rt.jar, since we require 'com.sun.tools.doclets.Taglet',
+         w/o it breaks build on OSX w/ Java6 compiler. 
+         Surprisingly it works on other platforms, which seems to pick classes
+         outside of the 'bootclasspath'.
+      -->
     <javac destdir="${classes}"
            includeAntRuntime="true"
            excludes="${gluegen.excludes.all} ${gluegen-rt.classes} ${java.part.android}"
@@ -728,7 +734,7 @@
            encoding="UTF-8"
            source="${target.sourcelevel}" 
            target="${target.targetlevel}" 
-           bootclasspath="${target.rt.jar}"
+           bootclasspath="${host.rt.jar}"
            debug="${javacdebug}" debuglevel="${javacdebuglevel}">
       <src path="${src.java}" />
       <src path="${src.generated.java}" />
-- 
cgit v1.2.3