diff options
| author | Omair Javaid <omair.javaid@linaro.org> | 2016-08-02 07:56:11 +0000 |
|---|---|---|
| committer | Omair Javaid <omair.javaid@linaro.org> | 2016-08-02 07:56:11 +0000 |
| commit | 9845320280fe3b2b2b64eb8832eb9dfbd4958555 (patch) | |
| tree | 027d29146513975510e01ec2688d2c7da732fad7 /lldb/packages/Python/lldbsuite/test | |
| parent | dfa7683d716895339b90fc71fa47667ff61f2826 (diff) | |
| download | bcm5719-llvm-9845320280fe3b2b2b64eb8832eb9dfbd4958555.tar.gz bcm5719-llvm-9845320280fe3b2b2b64eb8832eb9dfbd4958555.zip | |
Correct makefile.rules to use toolchain specific AR and OBJCOPY
Differential revision: https://reviews.llvm.org/D20386
llvm-svn: 277429
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index c37ef745e8b..fb7bb9e0d7f 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -265,8 +265,6 @@ 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 #---------------------------------------------------------------------- @@ -287,24 +285,25 @@ endif #---------------------------------------------------------------------- # Android specific options #---------------------------------------------------------------------- -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) + +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) + #---------------------------------------------------------------------- # C++ standard library options #---------------------------------------------------------------------- |
