[lldbsuite] Invoke sed on Windows to determine the cache dir for clang

[stella.stamenova]

Summary

In order to invoke sed on Windows, we need to quote the command correctly. Since we already have commands which do that, move the definitions at the beginning of the file and then re-use them for each command.

lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules

 # C:\cygwin\bin\sh.exe. This shell fails for numerous different reasons
 # so default to using cmd.exe.
 #----------------------------------------------------------------------
 ifeq "$(OS)" "Windows_NT"
   SHELL = $(WINDIR)\system32\cmd.exe
 endif
 
 #----------------------------------------------------------------------
+# If the OS is Windows use double-quotes in commands
+#
+# For other operating systems, single-quotes work fine, but on Windows
+# 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
+
+#----------------------------------------------------------------------
 # If TRIPLE is not defined try to set the ARCH, CC, CFLAGS, and more
 # from the triple alone
 #----------------------------------------------------------------------
 ARCH_CFLAGS :=
 ifneq "$(TRIPLE)" ""
   triple_space = $(subst -, ,$(TRIPLE))
   ARCH =$(word 1, $(triple_space))
   TRIPLE_VENDOR =$(word 2, $(triple_space))
   triple_os_and_version =$(shell echo $(word 3, $(triple_space)) | sed 's/\([a-z]*\)\(.*\)/\1 \2/')
   TRIPLE_OS =$(word 1, $(triple_os_and_version))
   TRIPLE_VERSION =$(word 2, $(triple_os_and_version))
   ifeq "$(TRIPLE_VENDOR)" "apple"
     ifeq "$(TRIPLE_OS)" "ios"
-        CODESIGN := codesign
-        ifeq "$(SDKROOT)" ""
+      CODESIGN := codesign
+      ifeq "$(SDKROOT)" ""
         # Set SDKROOT if it wasn't set
         ifneq (,$(findstring arm,$(ARCH)))
           SDKROOT = $(shell xcrun --sdk iphoneos --show-sdk-path)
           ifeq "$(TRIPLE_VERSION)" ""
             TRIPLE_VERSION =$(shell echo $(notdir $(SDKROOT)) | sed -e 's/.*\([0-9]\.[0-9]\).*/\1/')
           endif
           ARCH_CFLAGS :=-mios-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)"
         else
else
   CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(ARCH_CFLAGS) $(CFLAGS_EXTRAS)
 endif
 
 ifeq "$(MAKE_DWO)" "YES"
   CFLAGS += -gsplit-dwarf
 endif
 
 # Use a shared module cache when building in the default test build directory.
-ifeq "$(OS)" "Windows_NT"
-CLANG_MODULE_CACHE_DIR := $(BUILDDIR)/module-cache
-else
-# FIXME: Get sed to work on Windows here.
-CLANG_MODULE_CACHE_DIR := $(shell echo "$(BUILDDIR)" | sed 's/lldb-test-build.noindex.*/lldb-test-build.noindex\/module-cache-clang/')
-endif
+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
 $(warning failed to set the shared clang module cache dir)
 endif
 
 MANDATORY_MODULE_BUILD_CFLAGS := -fmodules -gmodules -fmodules-cache-path=$(CLANG_MODULE_CACHE_DIR)
 
ifneq "$(OS)" "Darwin"
     endif
 
     OBJCOPY ?= $(call replace_cc_with,objcopy)
     ARCHIVER ?= $(call replace_cc_with,ar)
     override AR = $(ARCHIVER)
 endif
 
 ifdef PIE
-    LDFLAGS += -pie
+  LDFLAGS += -pie
 endif
 
 #----------------------------------------------------------------------
 # Windows specific options
 #----------------------------------------------------------------------
 ifeq "$(OS)" "Windows_NT"
   ifneq (,$(findstring clang,$(CC)))
     # Clang for Windows doesn't support C++ Exceptions
ifneq "$(strip $(DYLIB_C_SOURCES))" ""
   DYLIB_OBJECTS +=$(strip $(DYLIB_C_SOURCES:.c=.o))
 endif
 
 ifneq "$(strip $(DYLIB_OBJC_SOURCES))" ""
   DYLIB_OBJECTS +=$(strip $(DYLIB_OBJC_SOURCES:.m=.o))
 endif
 
 ifneq "$(strip $(DYLIB_CXX_SOURCES))" ""
-    DYLIB_OBJECTS +=$(strip $(DYLIB_CXX_SOURCES:.cpp=.o))
-    CXX = $(call cxx_compiler,$(CC))
-    LD = $(call cxx_linker,$(CC))
+  DYLIB_OBJECTS +=$(strip $(DYLIB_CXX_SOURCES:.cpp=.o))
+  CXX = $(call cxx_compiler,$(CC))
+  LD = $(call cxx_linker,$(CC))
 endif
 
 #----------------------------------------------------------------------
 # Check if we have a precompiled header
 #----------------------------------------------------------------------
 ifneq "$(strip $(PCH_CXX_SOURCE))" ""
-    PCH_OUTPUT = $(PCH_CXX_SOURCE:.h=.h.pch)
-    PCHFLAGS = -include $(PCH_CXX_SOURCE)
+  PCH_OUTPUT = $(PCH_CXX_SOURCE:.h=.h.pch)
+  PCHFLAGS = -include $(PCH_CXX_SOURCE)
 endif
 
 #----------------------------------------------------------------------
 # Check if we have any C source files
 #----------------------------------------------------------------------
 ifneq "$(strip $(C_SOURCES))" ""
   OBJECTS +=$(strip $(C_SOURCES:.c=.o))
 endif

 
 #----------------------------------------------------------------------
 # Check if we are compiling with gcc 4.6
 #----------------------------------------------------------------------
 ifneq "$(strip $(CXX_SOURCES) $(OBJCXX_SOURCES))" ""
 ifneq "$(filter g++,$(CXX))" ""
   CXXVERSION = $(shell $(CXX) -dumpversion | cut -b 1-3)
   ifeq "$(CXXVERSION)" "4.6"
-                # GCC 4.6 cannot handle -std=c++11, so replace it with -std=c++0x
-                # instead. FIXME: remove once GCC version is upgraded.
+    # GCC 4.6 cannot handle -std=c++11, so replace it with -std=c++0x
+    # instead. FIXME: remove once GCC version is upgraded.
     override CXXFLAGS := $(subst -std=c++11,-std=c++0x,$(CXXFLAGS))
   endif
 endif
 endif
 
 ifeq ($(findstring clang, $(CXX)), clang)
-  CXXFLAGS += --driver-mode=g++
+  CXXFLAGS += --driver-mode=g++
 endif
 
 ifneq "$(CXX)" ""
-  ifeq ($(findstring clang, $(LD)), clang)
-    LDFLAGS += --driver-mode=g++
-  endif
+  ifeq ($(findstring clang, $(LD)), clang)
+    LDFLAGS += --driver-mode=g++
+  endif
 endif
 
 #----------------------------------------------------------------------
 # DYLIB_ONLY variable can be used to skip the building of a.out.
 # See the sections below regarding dSYM file as well as the building of
 # EXE from all the objects.
 #----------------------------------------------------------------------
 
ifneq "$(DYLIB_NAME)" ""
   DYLIB_DWOS := $(DYLIB_OBJECTS:.o=.dwo)
 endif
 
 #----------------------------------------------------------------------
 # Rule for Generating Prerequisites Automatically using .d files and
 # 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 && \
   sed $(QUOTE)s,\($*\)\.o[ :]*,\1.o $@ : ,g$(QUOTE) < $@.tmp > $@ $(JOIN_CMD) \
   rm -f $@.tmp
 
 %.d: %.cpp
   @rm -f $@ $(JOIN_CMD) \