diff options
| author | Adrian Prantl <aprantl@apple.com> | 2018-11-17 00:45:58 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2018-11-17 00:45:58 +0000 |
| commit | b3d7092ab8978f523a6e3fe7108690b12a2e497d (patch) | |
| tree | ff18a1446d267709d9a0d705785b34d4517f6a08 /lldb/packages/Python/lldbsuite/test | |
| parent | f97540083831aa25560873596cf497b5c612eef5 (diff) | |
| download | bcm5719-llvm-b3d7092ab8978f523a6e3fe7108690b12a2e497d.tar.gz bcm5719-llvm-b3d7092ab8978f523a6e3fe7108690b12a2e497d.zip | |
Makefile.rules: Fix the windows-sed-quoting issue harder.
llvm-svn: 347120
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index 041f21c0172..bb8656827bc 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -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 && \ |
