diff options
| author | Adrian Prantl <aprantl@apple.com> | 2018-11-17 01:27:46 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2018-11-17 01:27:46 +0000 |
| commit | 3d6c743f4e78bdd5b824a051bb47a289a61e6899 (patch) | |
| tree | 51801ca62c422df5ad218866e1cab40996803b80 /lldb/packages/Python/lldbsuite/test/make | |
| parent | 5ec95dbd74c20303fe9add19cf29e40f203d0066 (diff) | |
| download | bcm5719-llvm-3d6c743f4e78bdd5b824a051bb47a289a61e6899.tar.gz bcm5719-llvm-3d6c743f4e78bdd5b824a051bb47a289a61e6899.zip | |
Revert "Makefile.rules: Fix the windows-sed-quoting issue harder."
llvm-svn: 347124
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/make')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index bb8656827bc..028d6871edb 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -252,18 +252,8 @@ 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 $(QUOTE)s,lldb-test-build.noindex.*,lldb-test-build.noindex\/module-cache-clang,$(QUOTE)) +CLANG_MODULE_CACHE_DIR := $(shell echo "$(BUILDDIR)" | sed 's/lldb-test-build.noindex.*/lldb-test-build.noindex\/module-cache-clang/') ifeq "$(findstring lldb-test-build.noindex, $(BUILDDIR))" "" CLANG_MODULE_CACHE_DIR := $(BUILDDIR)/module-cache @@ -633,6 +623,16 @@ 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 = " + FIXUP_SYNTAX_HIGHLIGHTING_IN_MY_EDITOR = " +else + JOIN_CMD = ; + QUOTE = ' + FIXUP_SYNTAX_HIGHLIGHTING_IN_MY_EDITOR = ' +endif + %.d: %.c @rm -f $@ $(JOIN_CMD) \ $(CC) -M $(CFLAGS) $< > $@.tmp && \ |
