diff options
| author | Mark Rothwell <[email protected]> | 2010-06-26 04:45:59 +0000 |
|---|---|---|
| committer | Mark Rothwell <[email protected]> | 2010-06-26 04:45:59 +0000 |
| commit | eb3c211bec5867f37a38334355261a6483ec4249 (patch) | |
| tree | df6c945b351b63bffbdff8ae42e83ac693bc7e44 /make | |
| parent | 5330765253a740e809fd739849b61ce4f7889735 (diff) | |
Use the correct linker configurations on FreeBSD and fix the java.includes.dir property.
Diffstat (limited to 'make')
| -rwxr-xr-x | make/build.xml | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/make/build.xml b/make/build.xml index 193c353..7f95d4c 100755 --- a/make/build.xml +++ b/make/build.xml @@ -285,12 +285,23 @@ <property name="java.includes.dir.platform" value="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers" /> </target> - <target name="declare.freebsd" if="isFreeBSD"> - <echo message="FreeBSD" /> + <target name="declare.freebsd.amd64" if="isFreeBSDAMD64"> + <echo message="FreeBSDAMD64" /> <property name="compiler.cfg.id" value="compiler.cfg.freebsd" /> - <property name="linker.cfg.id" value="linker.cfg.linux" /> + <property name="linker.cfg.id" value="linker.cfg.freebsd.amd64" /> <property name="c.src.dir.os" value="unix" /> - <property name="java.includes.dir.freebsd" value="${java.includes.dir}/freebsd" /> + </target> + + <target name="declare.freebsd.x86" if="isFreeBSDX86"> + <echo message="FreeBSDX86" /> + <property name="compiler.cfg.id" value="compiler.cfg.freebsd" /> + <property name="linker.cfg.id" value="linker.cfg.freebsd.x86" /> + <property name="c.src.dir.os" value="unix" /> + </target> + + <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64" if="isFreeBSD" > + <property name="c.src.dir.os" value="unix" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/freebsd" /> </target> <target name="declare.hpux" if="isHPUX"> |