Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3a8b62d authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

Merge "Make sure compiler flags also pick up correct toolchain."

parents 0bf80735 62304f1e

core/llvm_config.mk

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ CLANG_CONFIG_UNKNOWN_CFLAGS := \ 
ifeq ($(TARGET_ARCH),arm)

  CLANG_CONFIG_EXTRA_CFLAGS += \

    -target arm-linux-androideabi \

    -B$(TARGET_TOOLCHAIN_ROOT)/arm-linux-androideabi/bin \

    -mllvm -arm-enable-ehabi

  CLANG_CONFIG_EXTRA_LDFLAGS += \

    -target arm-linux-androideabi \
@@ -35,7 +36,8 @@ ifeq ($(TARGET_ARCH),arm) 
endif

ifeq ($(TARGET_ARCH),x86)

  CLANG_CONFIG_EXTRA_CFLAGS += \

    -target i686-android-linux

    -target i686-android-linux \

    -B$(TARGET_TOOLCHAIN_ROOT)/i686-android-linux/bin

  CLANG_CONFIG_EXTRA_LDFLAGS += \

    -target i686-android-linux \

    -B$(TARGET_TOOLCHAIN_ROOT)/i686-android-linux/bin