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

Commit 5077d6b4 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 0a2c133d: am 5b768a72: am f14653ce: Merge "x86_common.mk has been replaced... 

am 0a2c133d: am 5b768a72: am f14653ce: Merge "x86_common.mk has been replaced by HOST_x86_common.mk"

* commit '0a2c133d':
  x86_common.mk has been replaced by HOST_x86_common.mk
parents 3125523e 0a2c133d

core/clang/x86_common.mk

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
ifeq ($(HOST_OS),darwin)

# nothing required here yet

endif



ifeq ($(HOST_OS),linux)

CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \

  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -no-integrated-as



CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \

  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \

  -no-integrated-as



ifneq ($(strip $(BUILD_HOST_64bit)),)

CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS :=   \

  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6 \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/x86_64-linux \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/backward \

  -no-integrated-as



CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \

  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -B$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \

  -B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6 \

  -L$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6 \

  -L$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64/ \

  -no-integrated-as

else

CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS :=   \

  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6 \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/x86_64-linux/32 \

  -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/backward \

  -no-integrated-as



CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \

  --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -B$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \

  -B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6/32 \

  -L$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6/32 \

  -L$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib32/ \

  -no-integrated-as

endif

endif



ifeq ($(HOST_OS),windows)

# nothing required here yet

endif
 
 No newline at end of file