diff options
| author | Sven Gothel <[email protected]> | 2013-01-31 16:11:59 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-01-31 16:11:59 +0100 |
| commit | c8de8fbf5d080b674b509763fbb7374c21ee705b (patch) | |
| tree | 1b6784d40beceda4be6c7f1dfa106137fe11eb0b | |
| parent | e58643727cc36d6dc27cec9e02934c26de7621ee (diff) | |
Fix comments in gluegen-cpptasks-android* config file
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv6.xml | 6 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv7.xml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/make/lib/gluegen-cpptasks-android-armv6.xml b/make/lib/gluegen-cpptasks-android-armv6.xml index a48f5a3..733f623 100644 --- a/make/lib/gluegen-cpptasks-android-armv6.xml +++ b/make/lib/gluegen-cpptasks-android-armv6.xml @@ -34,10 +34,10 @@ <echo message="Custom forced compiler Android NDK, linker.cfg.android" /> <compiler id="compiler.cfg.android" name="gcc"> <compilerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" /> - <!-- The default search dirs for 'gcc from $NDK_TOOLCHAIN/$TARGET_TRIPLE/bin will not find + <!-- 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. - NOTE: This is not necessary if using '$TARGET_TRIPLE-gcc' from $NDK_TOOLCHAIN/bin. --> + NOTE: This is not necessary if using '$TARGET_TRIPLE-gcc' from $NDK_TOOLCHAIN_ROOT/bin. --> <compilerarg value="-B${env.NDK_TOOLCHAIN_ROOT}/libexec/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}" /> <compilerarg value="-ffunction-sections" /> @@ -90,7 +90,7 @@ <linkerarg value="--gc-sections" /> <linkerarg value="--no-undefined" /> <linkerarg value="-static-libgcc"/> - <!-- The gcc from $NDK_TOOLCHAIN/$TARGET_TRIPLE/bin needs to be told + <!-- The gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin needs to be told where to find libgcc as the default location (gcc -print-search-dirs) is not correct. Not sure if this is a bug in the NDK or not. We also enforce that libgcc is linked after source files but before other shared diff --git a/make/lib/gluegen-cpptasks-android-armv7.xml b/make/lib/gluegen-cpptasks-android-armv7.xml index 9179ac4..d854d4f 100644 --- a/make/lib/gluegen-cpptasks-android-armv7.xml +++ b/make/lib/gluegen-cpptasks-android-armv7.xml @@ -34,10 +34,10 @@ <echo message="Custom forced compiler Android NDK, linker.cfg.android" /> <compiler id="compiler.cfg.android" name="gcc"> <compilerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" /> - <!-- The default search dirs for 'gcc from $NDK_TOOLCHAIN/$TARGET_TRIPLE/bin will not find + <!-- 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. - NOTE: This is not necessary if using '$TARGET_TRIPLE-gcc' from $NDK_TOOLCHAIN/bin. --> + NOTE: This is not necessary if using '$TARGET_TRIPLE-gcc' from $NDK_TOOLCHAIN_ROOT/bin. --> <compilerarg value="-B${env.NDK_TOOLCHAIN_ROOT}/libexec/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}" /> <compilerarg value="-ffunction-sections" /> @@ -90,7 +90,7 @@ <linkerarg value="--gc-sections" /> <linkerarg value="--no-undefined" /> <linkerarg value="-static-libgcc"/> - <!-- The gcc from $NDK_TOOLCHAIN/$TARGET_TRIPLE/bin needs to be told + <!-- The gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin needs to be told where to find libgcc as the default location (gcc -print-search-dirs) is not correct. Not sure if this is a bug in the NDK or not. We also enforce that libgcc is linked after source files but before other shared |