diff options
| author | Sven Gothel <[email protected]> | 2011-10-18 07:00:46 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-10-18 07:00:46 +0200 |
| commit | 13488392fcd8f9253f82557158cd1e7c45c36e41 (patch) | |
| tree | 966e72568cee5ab96646c6e8f822a83628c91dbd /make/gluegen-cpptasks-base.xml | |
| parent | f818817f3c0b14fe8317eaf5e1e1fff0a19884d0 (diff) | |
Fix Solaris gcc args ; Adding JVM arch flags (-d32/-d64)
Diffstat (limited to 'make/gluegen-cpptasks-base.xml')
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index e7af64c..7d28aef 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -40,6 +40,7 @@ - isWindows - isWindowsX86 - isWindowsAMD64 + - is64Bit - - isX11 is set if: !isWindows && !isOSX && !noX11 - @@ -335,6 +336,19 @@ <os name="SunOS" arch="amd64" /> </condition> + <condition property="is64Bit"> + <or> + <os arch="amd64" /> + <os arch="AMD64" /> + <os arch="sparcv9" /> + <os arch="IA64" /> + <os arch="AMD64" /> + <os arch="x86_64" /> + <os arch="AMD64" /> + <os arch="x86_64" /> + </or> + </condition> + <echo message="FreeBSD=${isFreeBSD}" /> <echo message="FreeBSDX86=${isFreeBSDX86}" /> <echo message="FreeBSDAMD64=${isFreeBSDAMD64}" /> @@ -360,6 +374,7 @@ <echo message="Unix=${isUnix}" /> <echo message="Windows=${isWindows}" /> <echo message="X11=${isX11}" /> + <echo message="is64Bit=${is64Bit}" /> </target> <target name="gluegen.cpptasks.detect.os.freebsd.x86" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDX86"> @@ -698,6 +713,7 @@ <!-- SOLARIS compiler configuration --> <compiler id="compiler.cfg.solaris" name="gcc"> + <compilerarg value="-m32"/> <defineset> <define name="__unix__"/> <define name="__X11__" if="isX11"/> @@ -723,10 +739,12 @@ </compiler> <compiler id="compiler.cfg.solaris.amd64" name="gcc"> - <compilerarg value="-fast" /> - <compilerarg value="-xchip=opteron" /> - <compilerarg value="-xarch=amd64" /> - <compilerarg value="-xcache=64/64/2:1024/64/16" /> + <compilerarg value="-fPIC"/> + <compilerarg value="-m64"/> + <!-- compilerarg value="-fast" /--> + <!-- compilerarg value="-xchip=opteron" / --> + <!-- compilerarg value="-xarch=amd64" / --> + <!-- compilerarg value="-xcache=64/64/2:1024/64/16" / --> <defineset> <define name="__unix__"/> <define name="__X11__" if="isX11"/> @@ -867,6 +885,7 @@ <!-- SOLARIS linker configuration --> <linker id="linker.cfg.solaris" name="gcc"> + <linkerarg value="-m32"/> </linker> <linker id="linker.cfg.solaris.sparcv9" name="gcc"> @@ -874,7 +893,8 @@ </linker> <linker id="linker.cfg.solaris.amd64" name="gcc"> - <linkerarg value="-xarch=amd64" /> + <linkerarg value="-m64"/> + <!-- linkerarg value="-xarch=amd64" / --> </linker> <!-- MacOSX linker configuration --> |