maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Makefile.rules: Fix the windows-sed-quoting issue harder. 

llvm-svn: 347120
This commit is contained in:
Adrian Prantl 2018-11-17 00:45:58 +00:00
parent f975400838
commit b3d7092ab8
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lldb/packages/Python/lldbsuite/test/make/Makefile.rules
View File

@ -252,8 +252,18 @@ ifeq "$(MAKE_DWO)" "YES"
CFLAGS += -gsplit-dwarf CFLAGS += -gsplit-dwarf
endif 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. # 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))" "" ifeq "$(findstring lldb-test-build.noindex, $(BUILDDIR))" ""
CLANG_MODULE_CACHE_DIR := $(BUILDDIR)/module-cache CLANG_MODULE_CACHE_DIR := $(BUILDDIR)/module-cache
@ -623,14 +633,6 @@ endif
# the compiler -MM option. The -M option will list all system headers, # the compiler -MM option. The -M option will list all system headers,
# and the -MM option will list all non-system dependencies. # 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 %.d: %.c
@rm -f $@ $(JOIN_CMD) \ @rm -f $@ $(JOIN_CMD) \
$(CC) -M $(CFLAGS) $< > $@.tmp && \ $(CC) -M $(CFLAGS) $< > $@.tmp && \