From 943ea259144a7f2af3678208a7275833f8a8879c Mon Sep 17 00:00:00 2001
From: Mark Rothwell <rothwell@coreland.ath.cx>
Date: Sat, 26 Jun 2010 04:51:48 +0000
Subject: Split FreeBSD in the same manner as Linux: isFreeBSD, isFreeBSDX86,
 isFreeBSDAMD64

---
 make/gluegen-cpptasks-base.xml | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'make')

diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index dd366fe..0c3ab68 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -16,6 +16,8 @@
    - configuration is exactly as specified.
    - 
    -   isFreeBSD
+   -   isFreeBSDAMD64
+   -   isFreeBSDX86
    -   isHPUX
    -   isIA64
    -   isLinux
@@ -102,6 +104,8 @@
    -   compiler.cfg.hpux
    -   linker.cfg.linux
    -   linker.cfg.linux.amd64
+   -   linker.cfg.freebsd.x86
+   -   linker.cfg.freebsd.amd64
    -   linker.cfg.solaris
    -   linker.cfg.solaris.sparcv9
    -   linker.cfg.solaris.amd64
@@ -157,6 +161,9 @@
         </not>
       </and>
     </condition>
+    <condition property="isFreeBSD">
+      <os name="FreeBSD" />
+    </condition>
     <condition property="isLinux">
       <os name="Linux" />
     </condition>
@@ -181,8 +188,23 @@
 	<os arch="amd64" />
       </and>
     </condition>
-    <condition property="isFreeBSD">
-      <os name="FreeBSD" />
+    <condition property="isFreeBSDX86">
+      <and>
+        <istrue value="${isFreeBSD}" />
+        <or>
+          <os arch="i386" />
+          <os arch="x86" />
+        </or>
+      </and>
+    </condition>
+    <condition property="isFreeBSDAMD64">
+      <and>
+        <istrue value="${isFreeBSD}" />
+        <or>
+          <os arch="AMD64" />
+          <os arch="x86_64" />
+        </or>
+      </and>
     </condition>
     <condition property="isHPUX">
       <os name="HP-UX" />
@@ -275,6 +297,8 @@
     </condition>
 
     <echo message="FreeBSD=${isFreeBSD}" />
+    <echo message="FreeBSDX86=${isFreeBSDX86}" />
+    <echo message="FreeBSDAMD64=${isFreeBSDAMD64}" />
     <echo message="HPUX=${isHPUX}" />
     <echo message="IA64=${isIA64}" />
     <echo message="Linux=${isLinux}" />
-- 
cgit v1.2.3