diff options
| author | Sven Gothel <[email protected]> | 2012-02-19 03:06:13 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-02-19 03:06:13 +0100 |
| commit | 50266278b5af898a4ae5da7f5db3754a2b8005d9 (patch) | |
| tree | f8c65c7e52b99787f7cda15ecd337219924ceea7 /make/gluegen-cpptasks-base.xml | |
| parent | 9451174b1757675e75db44dc09e2888807f112d9 (diff) | |
Fix [linux] armv7 cross build (regression of commit 196c325aa3dddb0d775e8fb80e26333208fe6c7e) - generalize env. TARGET_JAVA_LIBS
Diffstat (limited to 'make/gluegen-cpptasks-base.xml')
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index f0ea963..fb721dd 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -1146,6 +1146,13 @@ <!-- - Platform specific declares. --> + <target name="gluegen.cpptasks.declare.compiler.environment" > + <condition property="java.lib.dir.platform" + value="${env.TARGET_JAVA_LIBS}" > + <available file="${env.TARGET_JAVA_LIBS}" type="dir" /> + </condition> + </target> + <target name="gluegen.cpptasks.declare.compiler.win32.vc6" if="isVC6"> <echo message="Win32.VC6" /> <property name="compiler.cfg.id.base" value="compiler.cfg.win32.msvc" /> @@ -1349,7 +1356,9 @@ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/PA_RISC2.0" /> </target> - <target name="gluegen.cpptasks.declare.compiler" depends="gluegen.cpptasks.declare.compiler.win32,gluegen.cpptasks.declare.compiler.linux,gluegen.cpptasks.declare.compiler.solaris,gluegen.cpptasks.declare.compiler.macosx,gluegen.cpptasks.declare.compiler.freebsd,gluegen.cpptasks.declare.compiler.hpux" /> + <target name="gluegen.cpptasks.declare.compiler" depends="gluegen.cpptasks.declare.compiler.environment,gluegen.cpptasks.declare.compiler.win32,gluegen.cpptasks.declare.compiler.linux,gluegen.cpptasks.declare.compiler.solaris,gluegen.cpptasks.declare.compiler.macosx,gluegen.cpptasks.declare.compiler.freebsd,gluegen.cpptasks.declare.compiler.hpux" > + <echo message="java.lib.dir.platform: ${java.lib.dir.platform}" /> + </target> <target name="gluegen.cpptasks.setup.compiler" depends="gluegen.cpptasks.detect.compiler,gluegen.cpptasks.configure.compiler,gluegen.cpptasks.declare.compiler" /> |