From: Ying Wang Date: Fri, 16 May 2014 01:50:06 +0000 (-0700) Subject: x86_common.mk has been replaced by HOST_x86_common.mk X-Git-Tag: android-x86-6.0-r1~445^2~396^2~43^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a303c4f5461b367c5e72f69b8c0d1be9fe50499e;p=android-x86%2Fbuild.git x86_common.mk has been replaced by HOST_x86_common.mk Change-Id: I19eea82bb35d3f65a2d894c687131a1eafbe2cc9 --- diff --git a/core/clang/x86_common.mk b/core/clang/x86_common.mk deleted file mode 100644 index 0bb565f52..000000000 --- a/core/clang/x86_common.mk +++ /dev/null @@ -1,54 +0,0 @@ -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