maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Correct makefile.rules to use toolchain specific AR and OBJCOPY 

Differential revision: https://reviews.llvm.org/D20386

llvm-svn: 277429
This commit is contained in:
Omair Javaid 2016-08-02 07:56:11 +00:00
parent dfa7683d71
commit 9845320280
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lldb/packages/Python/lldbsuite/test/make/Makefile.rules
View File

@ -265,8 +265,6 @@ cxx_linker_notdir = $(if $(findstring clang,$(1)), \
$(subst cc,c++,$(1)))))) $(subst cc,c++,$(1))))))
cxx_linker = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call cxx_linker_notdir,$(notdir $(1)))),$(call cxx_linker_notdir,$(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 # Windows specific options
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@ -287,24 +285,25 @@ endif
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Android specific options # Android specific options
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ifeq "$(OS)" "Android"
ifdef PIE ifdef PIE
LDFLAGS += -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 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 # C++ standard library options
#---------------------------------------------------------------------- #----------------------------------------------------------------------