diff options
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/x86_common.mk | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/core/clang/x86_common.mk b/core/clang/x86_common.mk index bce95cb..aaee62e 100644 --- a/core/clang/x86_common.mk +++ b/core/clang/x86_common.mk @@ -4,14 +4,6 @@ endif ifeq ($(HOST_OS),linux) -ifneq ($(strip $(BUILD_HOST_64bit)),) -# Needs to be updated along with gcc -HOST_ARCH_DESCRIPTOR_FOR_CLANG := x86_64-linux -else -# Needs to be updated along with gcc -HOST_ARCH_DESCRIPTOR_FOR_CLANG := i686-linux -endif - CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \ --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \ --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot @@ -19,27 +11,38 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \ --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \ +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)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/include/c++/4.6.x-google \ - -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/include/c++/4.6.x-google/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG) \ - -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/include/c++/4.6.x-google/backward \ + -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 \ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \ --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \ --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \ - -B$(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/bin \ - -B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/4.6.x-google \ - -L$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/4.6.x-google - -ifneq ($(strip $(BUILD_HOST_64bit)),) -# need to add lib64 if building 64-bit, otherwise lib -CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS += -L$(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/lib64/ + -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/ else -CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS += -L$(HOST_TOOLCHAIN_FOR_CLANG)/$(HOST_ARCH_DESCRIPTOR_FOR_CLANG)/lib/ +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 \ + +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/ +endif endif -endif # linux ifeq ($(HOST_OS),windows) # nothing required here yet |