summaryrefslogtreecommitdiffstats
path: root/make/lib
diff options
context:
space:
mode:
Diffstat (limited to 'make/lib')
-rw-r--r--make/lib/gluegen-cpptasks-android-aarch64.xml4
-rw-r--r--make/lib/gluegen-cpptasks-android-armv6.xml4
-rw-r--r--make/lib/gluegen-cpptasks-android-x86.xml4
3 files changed, 6 insertions, 6 deletions
diff --git a/make/lib/gluegen-cpptasks-android-aarch64.xml b/make/lib/gluegen-cpptasks-android-aarch64.xml
index c6956f4..90805a1 100644
--- a/make/lib/gluegen-cpptasks-android-aarch64.xml
+++ b/make/lib/gluegen-cpptasks-android-aarch64.xml
@@ -33,7 +33,7 @@
<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android">
<echo message="Custom forced compiler Android NDK, linker.cfg.android" />
<compiler id="compiler.cfg.android" name="gcc">
- <compilerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" />
+ <compilerarg value="--sysroot=${TARGET_PLATFORM_SYSROOT}" />
<!-- The default search dirs for 'gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin will not find
subprograms properly (see gcc -print-search-dirs). Not sure if this is a bug in the NDK
or not. Need to explicitly indicate where subprograms are with -B.
@@ -86,7 +86,7 @@
</compiler>
<linker id="linker.cfg.android" name="gcc">
- <linkerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" />
+ <linkerarg value="--sysroot=${TARGET_PLATFORM_SYSROOT}" />
<linkerarg value="-fpic" />
<!-- linkerarg value="-fPIE" / --> <!-- not for shared libs, won't produce symbols -->
diff --git a/make/lib/gluegen-cpptasks-android-armv6.xml b/make/lib/gluegen-cpptasks-android-armv6.xml
index 57999b2..c7e2c83 100644
--- a/make/lib/gluegen-cpptasks-android-armv6.xml
+++ b/make/lib/gluegen-cpptasks-android-armv6.xml
@@ -33,7 +33,7 @@
<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android">
<echo message="Custom forced compiler Android NDK, linker.cfg.android" />
<compiler id="compiler.cfg.android" name="gcc">
- <compilerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" />
+ <compilerarg value="--sysroot=${TARGET_PLATFORM_SYSROOT}" />
<!-- The default search dirs for 'gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin will not find
subprograms properly (see gcc -print-search-dirs). Not sure if this is a bug in the NDK
or not. Need to explicitly indicate where subprograms are with -B.
@@ -87,7 +87,7 @@
</compiler>
<linker id="linker.cfg.android" name="gcc">
- <linkerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" />
+ <linkerarg value="--sysroot=${TARGET_PLATFORM_SYSROOT}" />
<linkerarg value="-fpic" />
<linkerarg value="-ffunction-sections" />
diff --git a/make/lib/gluegen-cpptasks-android-x86.xml b/make/lib/gluegen-cpptasks-android-x86.xml
index 1cb0216..04cbb2c 100644
--- a/make/lib/gluegen-cpptasks-android-x86.xml
+++ b/make/lib/gluegen-cpptasks-android-x86.xml
@@ -32,7 +32,7 @@
<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android">
<echo message="Custom forced compiler Android NDK, linker.cfg.android" />
<compiler id="compiler.cfg.android" name="gcc">
- <compilerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" />
+ <compilerarg value="--sysroot=${TARGET_PLATFORM_SYSROOT}" />
<!-- The default search dirs for 'gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin will not find
subprograms properly (see gcc -print-search-dirs). Not sure if this is a bug in the NDK
or not. Need to explicitly indicate where subprograms are with -B.
@@ -78,7 +78,7 @@
</compiler>
<linker id="linker.cfg.android" name="gcc">
- <linkerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" />
+ <linkerarg value="--sysroot=${TARGET_PLATFORM_SYSROOT}" />
<linkerarg value="-fpic" />
<!-- linkerarg value="-fPIE" / --> <!-- not for shared libs, won't produce symbols -->