Author: omjavaid Date: Tue Aug 2 02:56:11 2016 New Revision: 277429 URL: http://llvm.org/viewvc/llvm-project?rev=277429&view=rev Log: Correct makefile.rules to use toolchain specific AR and OBJCOPY
Differential revision: https://reviews.llvm.org/D20386 Modified: lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules Modified: lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules?rev=277429&r1=277428&r2=277429&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules (original) +++ lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules Tue Aug 2 02:56:11 2016 @@ -265,8 +265,6 @@ cxx_linker_notdir = $(if $(findstring cl $(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 #---------------------------------------------------------------------- _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits