From 07ec87f14f2bb078235a7db25d4a923e9319f53c Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 25 May 2018 23:57:29 -0700 Subject: Avoid adding arch/cpu/tune flags for target to GCC build ... as it may need to override them for building runtime-selectable code. Signed-off-by: Alexey Neyman --- scripts/build/libc/bionic.sh | 2 +- scripts/build/libc/glibc.sh | 2 +- scripts/build/libc/newlib.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/build/libc') diff --git a/scripts/build/libc/bionic.sh b/scripts/build/libc/bionic.sh index 027493d4..573b8d4e 100644 --- a/scripts/build/libc/bionic.sh +++ b/scripts/build/libc/bionic.sh @@ -26,7 +26,7 @@ do_libc() { fi CT_DoStep INFO "Installing C library binaries" CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk/platforms/android-${CT_ANDROID_API}/arch-${arch}/usr" "${CT_SYSROOT_DIR}" - CT_EnvModify CT_TARGET_CFLAGS "${CT_TARGET_CFLAGS} -D__ANDROID_API__=${CT_ANDROID_API}" + CT_EnvModify CT_ALL_TARGET_CFLAGS "${CT_ALL_TARGET_CFLAGS} -D__ANDROID_API__=${CT_ANDROID_API}" } do_libc_post_cc() { diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 2f257b55..f8af7fc3 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -197,7 +197,7 @@ do_libc_backend_once() { esac # In the order of increasing precedence. Flags common to compiler and linker. - glibc_cflags+=" ${CT_TARGET_CFLAGS}" + glibc_cflags+=" ${CT_ALL_TARGET_CFLAGS}" glibc_cflags+=" ${CT_GLIBC_EXTRA_CFLAGS}" glibc_cflags+=" ${multi_flags}" diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index 5c4a3562..ca2f74be 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -94,7 +94,7 @@ ENABLE_TARGET_OPTSPACE:target-optspace [ "${CT_LIBC_NEWLIB_LTO}" = "y" ] && \ CT_LIBC_NEWLIB_TARGET_CFLAGS="${CT_LIBC_NEWLIB_TARGET_CFLAGS} -flto" - cflags_for_target="${CT_TARGET_CFLAGS} ${CT_LIBC_NEWLIB_TARGET_CFLAGS}" + cflags_for_target="${CT_ALL_TARGET_CFLAGS} ${CT_LIBC_NEWLIB_TARGET_CFLAGS}" # Note: newlib handles the build/host/target a little bit differently # than one would expect: -- cgit v1.2.3