Author: adrian
Date: Fri Nov 16 16:45:58 2018
New Revision: 347120
URL: http://llvm.org/viewvc/llvm-project?rev=347120&view=rev
Log:
Makefile.rules: Fix the windows-sed-quoting issue harder.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules
Modified: lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules?rev=347120&r1=347119&r2=347120&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules Fri Nov 16
16:45:58 2018
@@ -252,8 +252,18 @@ ifeq "$(MAKE_DWO)" "YES"
CFLAGS += -gsplit-dwarf
endif
+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
+
# Use a shared module cache when building in the default test build directory.
-CLANG_MODULE_CACHE_DIR := $(shell echo "$(BUILDDIR)" | sed
's/lldb-test-build.noindex.*/lldb-test-build.noindex\/module-cache-clang/')
+CLANG_MODULE_CACHE_DIR := $(shell echo "$(BUILDDIR)" | sed
$(QUOTE)s,lldb-test-build.noindex.*,lldb-test-build.noindex\/module-cache-clang,$(QUOTE))
ifeq "$(findstring lldb-test-build.noindex, $(BUILDDIR))" ""
CLANG_MODULE_CACHE_DIR := $(BUILDDIR)/module-cache
@@ -623,14 +633,6 @@ endif
# the compiler -MM option. The -M option will list all system headers,
# and the -MM option will list all non-system dependencies.
#----------------------------------------------------------------------
-ifeq "$(HOST_OS)" "Windows_NT"
- JOIN_CMD = &
- QUOTE = "
-else
- JOIN_CMD = ;
- QUOTE = '
-endif
-
%.d: %.c
@rm -f $@ $(JOIN_CMD) \
$(CC) -M $(CFLAGS) $< > $@.tmp && \
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
