diff options
| author | Sven Gothel <[email protected]> | 2019-04-08 03:36:31 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-04-08 03:36:31 +0200 |
| commit | 0bd5136c2df8407cea7b0dcc7fb1e62432ba18bb (patch) | |
| tree | 99b96af85460ad860d85ab7dcc5af40c25555798 /make/lib | |
| parent | 7bbb0822608fa9c832588c35874ead558a479322 (diff) | |
Bug 1190: Define TARGET_PLATFORM_SYSROOT TARGET_PLATFORM_USRROOT TARGET_PLATFORM_USRLIBS for crosscompilation
Android Crosscompilation Usage:
- TARGET_PLATFORM_ROOT -> TARGET_PLATFORM_SYSROOT
General
- TARGET_PLATFORM_SYSROOT Crosscompiler and system specified 'sysroot' (as in gcc --print-sysroot)
- TARGET_PLATFORM_USRROOT Additional optional user headers and libraries for target
- TARGET_PLATFORM_USRLIBS Actual location of target user libraries within TARGET_PLATFORM_USRROOT
- TARGET_JAVA_LIBS Actual location of the Java libraries within TARGET_PLATFORM_USRROOT
Diffstat (limited to 'make/lib')
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-aarch64.xml | 4 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv6.xml | 4 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-x86.xml | 4 |
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 --> |