diff options
| author | Tim Murray <timmurray@google.com> | 2014-03-20 13:48:35 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2014-03-24 19:38:47 -0700 |
| commit | 02cefc93a8b7555dd5e45f39348ab1473192983b (patch) | |
| tree | 938e50e6d5217484260f7d5a29de0f1f01421727 /core/clang/HOST_x86_64.mk | |
| parent | 8c1bbdb96ee1ea6be4d35236d8af20d5a2d78f6f (diff) | |
| download | build-02cefc93a8b7555dd5e45f39348ab1473192983b.zip build-02cefc93a8b7555dd5e45f39348ab1473192983b.tar.gz build-02cefc93a8b7555dd5e45f39348ab1473192983b.tar.bz2 | |
Make Clang host builds hermetic on Linux.
This lays the groundwork for making builds hermetic on Darwin as well.
That will be fixed in a future patch.
bug 13435344
Change-Id: Iae82d0b9efad0598d682ff5fd4daa737aa607866
Diffstat (limited to 'core/clang/HOST_x86_64.mk')
| -rw-r--r-- | core/clang/HOST_x86_64.mk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/core/clang/HOST_x86_64.mk b/core/clang/HOST_x86_64.mk index ea33a46..d60e15f 100644 --- a/core/clang/HOST_x86_64.mk +++ b/core/clang/HOST_x86_64.mk @@ -1,8 +1,13 @@ include $(BUILD_SYSTEM)/clang/x86_64.mk +include $(BUILD_SYSTEM)/clang/x86_common.mk ifeq ($(HOST_OS),linux) CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-linux-gnu +CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS) +CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS) +CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS) +CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS) endif ifeq ($(HOST_OS),darwin) CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-apple-darwin @@ -15,25 +20,29 @@ CLANG_CONFIG_x86_64_HOST_EXTRA_ASFLAGS := \ $(CLANG_CONFIG_EXTRA_ASFLAGS) \ $(CLANG_CONFIG_HOST_EXTRA_ASFLAGS) \ $(CLANG_CONFIG_x86_64_EXTRA_ASFLAGS) \ - -target $(CLANG_CONFIG_x86_64_HOST_TRIPLE) \ + $(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_ASFLAGS) \ + -target $(CLANG_CONFIG_x86_64_HOST_TRIPLE) CLANG_CONFIG_x86_64_HOST_EXTRA_CFLAGS := \ $(CLANG_CONFIG_EXTRA_CFLAGS) \ $(CLANG_CONFIG_HOST_EXTRA_CFLAGS) \ $(CLANG_CONFIG_x86_64_EXTRA_CFLAGS) \ + $(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CFLAGS) \ $(CLANG_CONFIG_x86_64_HOST_EXTRA_ASFLAGS) CLANG_CONFIG_x86_64_HOST_EXTRA_CPPFLAGS := \ $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_HOST_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_x86_64_EXTRA_CPPFLAGS) \ + $(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CPPFLAGS) \ + -target $(CLANG_CONFIG_x86_64_HOST_TRIPLE) CLANG_CONFIG_x86_64_HOST_EXTRA_LDFLAGS := \ $(CLANG_CONFIG_EXTRA_LDFLAGS) \ $(CLANG_CONFIG_HOST_EXTRA_LDFLAGS) \ $(CLANG_CONFIG_x86_64_EXTRA_LDFLAGS) \ - -target $(CLANG_CONFIG_x86_64_HOST_TRIPLE) \ - + $(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS) \ + -target $(CLANG_CONFIG_x86_64_HOST_TRIPLE) define convert-to-host-clang-flags $(strip \ |