[Lldb-commits] [PATCH] D20386: Correct makefile.rules to use arm/aarch64 target specific AR and OBJCOPY

[Muhammad Omair Javaid via lldb-commits]

omjavaid removed rL LLVM as the repository for this revision.
omjavaid updated this revision to Diff 67228.
omjavaid added a comment.

I have updated previous patch which handles compiler binaries which have version string appended at the end like gcc-4.9 or clang-3.5.

Kindly give it a review and let me know if its breaking any buildbots.


https://reviews.llvm.org/D20386

Files:
  packages/Python/lldbsuite/test/make/Makefile.rules

Index: packages/Python/lldbsuite/test/make/Makefile.rules
===================================================================
--- packages/Python/lldbsuite/test/make/Makefile.rules
+++ packages/Python/lldbsuite/test/make/Makefile.rules
@@ -265,8 +265,6 @@
                                         $(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
 #----------------------------------------------------------------------
@@ -291,20 +289,33 @@
     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
 
+CLANG_OR_GCC := $(strip $(if $(findstring clang,$(CC)), \
+                             $(findstring clang,$(CC)), \
+                             $(if $(findstring gcc,$(CC)), \
+                                  $(findstring gcc,$(CC)), \
+                                  cc)))
+
+CC_LASTWORD := $(strip $(lastword $(subst -, ,$(CC))))
+
+replace_with = $(strip $(if $(findstring $(3),$(CC_LASTWORD)), \
+                       $(subst $(3),$(1),$(2)), \
+                       $(if $(findstring ar,$(1)), \
+                            $(if $(findstring gcc,$(3)), \
+                                 $(subst gcc,gcc-ar,$(2)), \
+                                 $(subst $(3),$(1),$(2))), \
+                            $(subst $(3),$(1),$(subst -$(CC_LASTWORD),,$(2))))))
+
+ifeq "$(notdir $(CC))" "$(CC)"
+    replace_cc_with = $(call replace_with,$(1),$(CC),$(CLANG_OR_GCC))
+else
+    replace_cc_with = $(join $(dir $(CC)),$(call replace_with,$(1),$(notdir $(CC)),$(CLANG_OR_GCC)))
+endif
+
+OBJCOPY = $(call replace_cc_with,objcopy)
+AR = $(call replace_cc_with,ar)
+
 #----------------------------------------------------------------------
 # C++ standard library options
 #----------------------------------------------------------------------


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D20386.67228.patch
Type: text/x-patch
Size: 2572 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20160808/e4837e38/attachment-0001.bin>