diff options
author | Ying Wang <wangying@google.com> | 2014-05-16 01:51:34 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-16 01:51:34 +0000 |
commit | f14653cee4c98094d171c194b1af3e14b087ab09 (patch) | |
tree | 68c080fb73c8656d855f771d3a4ef24630ee386a | |
parent | f8cfbc0a10b75e6ec22b6e80b90df2a4386887b2 (diff) | |
parent | a303c4f5461b367c5e72f69b8c0d1be9fe50499e (diff) | |
download | build-f14653cee4c98094d171c194b1af3e14b087ab09.tar.gz |
Merge "x86_common.mk has been replaced by HOST_x86_common.mk"
-rw-r--r-- | core/clang/x86_common.mk | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/core/clang/x86_common.mk b/core/clang/x86_common.mk deleted file mode 100644 index 0bb565f52c..0000000000 --- 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 |