Author: Pavel Labath Date: 2020-07-15T16:03:45+02:00 New Revision: 313fca6520b43d95abb73e7c78a252a60ee4cf48
URL: https://github.com/llvm/llvm-project/commit/313fca6520b43d95abb73e7c78a252a60ee4cf48 DIFF: https://github.com/llvm/llvm-project/commit/313fca6520b43d95abb73e7c78a252a60ee4cf48.diff LOG: [lldb/test] Remove JOIN_CMD from Makefile.rules It's possible to achieve the same effect by providing multi-step recipe instead of a single-step recipe where the step happens to contain multiple commands. Added: Modified: lldb/packages/Python/lldbsuite/test/make/Makefile.rules Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index 5316c51899c7..b9a6937650d0 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -82,11 +82,9 @@ endif # we strictly required double-quotes #---------------------------------------------------------------------- ifeq "$(HOST_OS)" "Windows_NT" - JOIN_CMD = & QUOTE = " FIXUP_SYNTAX_HIGHLIGHTING_IN_MY_EDITOR = " else - JOIN_CMD = ; QUOTE = ' FIXUP_SYNTAX_HIGHLIGHTING_IN_MY_EDITOR = ' endif @@ -729,28 +727,28 @@ endif # and the -MM option will list all non-system dependencies. #---------------------------------------------------------------------- %.d: %.c - @rm -f $@ $(JOIN_CMD) \ - $(CC) -M $(CFLAGS) $< > $@.tmp && \ - sed $(QUOTE)s,\($*\)\.o[ :]*,\1.o $@ : ,g$(QUOTE) < $@.tmp > $@ $(JOIN_CMD) \ - rm -f $@.tmp + @rm -f $@ + @$(CC) -M $(CFLAGS) $< > $@.tmp && \ + sed $(QUOTE)s,\($*\)\.o[ :]*,\1.o $@ : ,g$(QUOTE) < $@.tmp > $@ + @rm -f $@.tmp %.d: %.cpp - @rm -f $@ $(JOIN_CMD) \ - $(CXX) -M $(CXXFLAGS) $< > $@.tmp && \ - sed $(QUOTE)s,\($*\)\.o[ :]*,\1.o $@ : ,g$(QUOTE) < $@.tmp > $@ $(JOIN_CMD) \ - rm -f $@.tmp + @rm -f $@ + @$(CXX) -M $(CXXFLAGS) $< > $@.tmp && \ + sed $(QUOTE)s,\($*\)\.o[ :]*,\1.o $@ : ,g$(QUOTE) < $@.tmp > $@ + @rm -f $@.tmp %.d: %.m - @rm -f $@ $(JOIN_CMD) \ - $(CC) -M $(CFLAGS) $< > $@.tmp && \ - sed $(QUOTE)s,\($*\)\.o[ :]*,\1.o $@ : ,g$(QUOTE) < $@.tmp > $@ $(JOIN_CMD) \ - rm -f $@.tmp + @rm -f $@ + @$(CC) -M $(CFLAGS) $< > $@.tmp && \ + sed $(QUOTE)s,\($*\)\.o[ :]*,\1.o $@ : ,g$(QUOTE) < $@.tmp > $@ + @rm -f $@.tmp %.d: %.mm - @rm -f $@ $(JOIN_CMD) \ - $(CXX) -M $(CXXFLAGS) $< > $@.tmp && \ - sed $(QUOTE)s,\($*\)\.o[ :]*,\1.o $@ : ,g$(QUOTE) < $@.tmp > $@ $(JOIN_CMD) \ - rm -f $@.tmp + @rm -f $@ + @$(CXX) -M $(CXXFLAGS) $< > $@.tmp && \ + sed $(QUOTE)s,\($*\)\.o[ :]*,\1.o $@ : ,g$(QUOTE) < $@.tmp > $@ + @rm -f $@.tmp #---------------------------------------------------------------------- # Include all of the makefiles for each source file so we don't have _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
