On 17/11/2018 02:27, Adrian Prantl via lldb-commits wrote:
Author: adrian
Date: Fri Nov 16 17:27:47 2018
New Revision: 347125

URL: http://llvm.org/viewvc/llvm-project?rev=347125&view=rev
Log:
Just don't even attempt to invoke sed on Windows.

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=347125&r1=347124&r2=347125&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules Fri Nov 16 
17:27:47 2018
@@ -253,7 +253,12 @@ ifeq "$(MAKE_DWO)" "YES"
  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
ifeq "$(findstring lldb-test-build.noindex, $(BUILDDIR))" ""
  CLANG_MODULE_CACHE_DIR := $(BUILDDIR)/module-cache


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits


Could we just have dotest pass the correct value for the module cache (or the root build dir, which would make the computation of the module cache dir trivial)?

This way you wouldn't even have to depend on the "default" build directory name.
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to