diff options
| author | Omair Javaid <omair.javaid@linaro.org> | 2016-08-02 13:17:49 +0000 |
|---|---|---|
| committer | Omair Javaid <omair.javaid@linaro.org> | 2016-08-02 13:17:49 +0000 |
| commit | 0aebb56a88dbdcde2d59bc222885fcf5a50cd5e8 (patch) | |
| tree | 6d143453342be30e80ee597ce02b6a845f6ddd97 /lldb/packages/Python | |
| parent | b650462007c1206cc0ea2da4854a585d822768c7 (diff) | |
| download | bcm5719-llvm-0aebb56a88dbdcde2d59bc222885fcf5a50cd5e8.tar.gz bcm5719-llvm-0aebb56a88dbdcde2d59bc222885fcf5a50cd5e8.zip | |
Revert rL277429: Correct makefile.rules to use toolchain specific AR and OBJCOPY
This commit is causing problems on gcc-* compiler with version number sufix.
Requires a new solution will post a follow up patch.
Differential revision: https://reviews.llvm.org/D20386
llvm-svn: 277453
Diffstat (limited to 'lldb/packages/Python')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index fb7bb9e0d7f..c37ef745e8b 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -265,6 +265,8 @@ cxx_linker_notdir = $(if $(findstring clang,$(1)), \ $(subst cc,c++,$(1)))))) cxx_linker = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call cxx_linker_notdir,$(notdir $(1)))),$(call cxx_linker_notdir,$(1))) +OBJCOPY := $(CROSS_COMPILE)objcopy + #---------------------------------------------------------------------- # Windows specific options #---------------------------------------------------------------------- @@ -285,25 +287,24 @@ endif #---------------------------------------------------------------------- # Android specific options #---------------------------------------------------------------------- - -ifdef PIE - LDFLAGS += -pie -endif - -replace_with = $(if $(findstring clang,$(1)), \ - $(subst clang,$(2),$(1)), \ - $(if $(findstring gcc,$(1)), \ - $(subst gcc,$(2),$(1)), \ - $(subst cc,$(2),$(1)))) -ifeq "$(notdir $(CC))" "$(CC)" - replace_cc_with = $(call replace_with,$(CC),$(1)) -else - replace_cc_with = $(join $(dir $(CC)),$(call replace_with,$(notdir $(CC)),$(1))) +ifeq "$(OS)" "Android" + ifdef PIE + LDFLAGS += -pie + endif + replace_with = $(if $(findstring clang,$(1)), \ + $(subst clang,$(2),$(1)), \ + $(if $(findstring gcc,$(1)), \ + $(subst gcc,$(2),$(1)), \ + $(subst cc,$(2),$(1)))) + ifeq "$(notdir $(CC))" "$(CC)" + replace_cc_with = $(call replace_with,$(CC),$(1)) + else + replace_cc_with = $(join $(dir $(CC)),$(call replace_with,$(notdir $(CC)),$(1))) + endif + OBJCOPY = $(call replace_cc_with,objcopy) + AR = $(call replace_cc_with,ar) endif -OBJCOPY = $(call replace_cc_with,objcopy) -AR = $(call replace_cc_with,ar) - #---------------------------------------------------------------------- # C++ standard library options #---------------------------------------------------------------------- |
