omjavaid updated this revision to Diff 66258.
omjavaid added a comment.
Herald added a subscriber: samparker.
Sorry about the delay updating this. I lost track of this rev earlier.
Have updated diff to use macro already present within Android specific block
for all cases.
Tested with no regressions on arm/aarch64 linux and android targets.
This possibly should address similar issues arising where there is architecture
difference between host and target.
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,21 @@
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
+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
#----------------------------------------------------------------------
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,21 @@
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
+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
