From 198cccab882db0409ee8b18fcafb20f079d9e01e Mon Sep 17 00:00:00 2001
From: Mark Rothwell <rothwell@coreland.ath.cx>
Date: Sat, 26 Jun 2010 04:54:04 +0000
Subject: Declare x86 and amd64 compilers for FreeBSD

---
 make/gluegen-cpptasks-base.xml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index cb26fe0..4d16c6d 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -839,7 +839,7 @@
       <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
       <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/i386" />
     </target>
-    
+
     <target name="gluegen.cpptasks.declare.compiler.linux.amd64" if="isLinuxAMD64">
       <echo message="Linux.AMD64" />
       <property name="compiler.cfg.id.base"          value="compiler.cfg.linux.amd64" /> 
@@ -889,14 +889,24 @@
       <property name="java.lib.dir.platform"         value="/System/Library/Frameworks/JavaVM.framework/Libraries" />
     </target>
 
-    <target name="gluegen.cpptasks.declare.compiler.freebsd" if="isFreeBSD">
+    <target name="gluegen.cpptasks.declare.compiler.freebsd.x86" if="isFreeBSDX86">
       <echo message="FreeBSD" />
       <property name="compiler.cfg.id.base"          value="compiler.cfg.freebsd" />
-      <property name="linker.cfg.id.base"            value="linker.cfg.linux" />
-      <property name="java.includes.dir.platform"    value="${java.includes.dir}/freebsd" />
+      <property name="linker.cfg.id.base"            value="linker.cfg.freebsd.x86" />
       <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/i386" />
     </target>
 
+    <target name="gluegen.cpptasks.declare.compiler.freebsd.amd64" if="isFreeBSDAMD64">
+      <echo message="FreeBSD" />
+      <property name="compiler.cfg.id.base"          value="compiler.cfg.freebsd" />
+      <property name="linker.cfg.id.base"            value="linker.cfg.freebsd.amd64" />
+      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/amd64" />
+    </target>
+
+    <target name="gluegen.cpptasks.declare.compiler.freebsd" depends="gluegen.cpptasks.declare.compiler.freebsd.x86,gluegen.cpptasks.declare.compiler.freebsd.amd64" if="isFreeBSD">
+      <property name="java.includes.dir.platform"    value="${java.includes.dir}/freebsd" />
+    </target>
+
     <target name="gluegen.cpptasks.declare.compiler.hpux" if="isHPUX">
       <echo message="HP-UX" />
       <property name="compiler.cfg.id.base"          value="compiler.cfg.hpux" />
-- 
cgit v1.2.3