Author: chaoren Date: Tue Jun 2 11:43:19 2015 New Revision: 238849 URL: http://llvm.org/viewvc/llvm-project?rev=238849&view=rev Log: Fix OBJCOPY and AR for Android.
Summary: Previously, OBJCOPY was empty because of the missing comma, and ar was just `ar`. Reviewers: ovyalov, tberghammer Subscribers: tberghammer, lldb-commits Differential Revision: http://reviews.llvm.org/D10175 Modified: lldb/trunk/test/make/Makefile.rules Modified: lldb/trunk/test/make/Makefile.rules URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/make/Makefile.rules?rev=238849&r1=238848&r2=238849&view=diff ============================================================================== --- lldb/trunk/test/make/Makefile.rules (original) +++ lldb/trunk/test/make/Makefile.rules Tue Jun 2 11:43:19 2015 @@ -216,15 +216,19 @@ endif # Android specific options #---------------------------------------------------------------------- ifeq "$(OS)" "Android" - objcopy_notdir = $(if $(findstring clang,$(1)), \ - $(subst clang,objcopy,$(1)), \ - $(if $(findstring gcc,$(1)), \ - $(subst gcc,objcopy,$(1)), \ - $(subst cc,objcopy,$(1)))))) - objcopy = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call objcopy_notdir,$(notdir $(1)))),$(call objcopy_notdir,$(1))) - LDFLAGS += -pie - OBJCOPY = $(call objcopy $(CC)) + 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 #---------------------------------------------------------------------- _______________________________________________ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
