[Lldb-commits] [lldb] r347104 - Makefile.rules: Degrade gracefully on Windows machines without sed.

Adrian Prantl via lldb-commits lldb-commits at lists.llvm.org
Fri Nov 16 14:44:57 PST 2018


Author: adrian
Date: Fri Nov 16 14:44:57 2018
New Revision: 347104

URL: http://llvm.org/viewvc/llvm-project?rev=347104&view=rev
Log:
Makefile.rules: Degrade gracefully on Windows machines without sed.

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=347104&r1=347103&r2=347104&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules Fri Nov 16 14:44:57 2018
@@ -253,14 +253,11 @@ ifeq "$(MAKE_DWO)" "YES"
 endif
 
 # Use a shared module cache when building in the default test build directory.
-ifeq "$(findstring lldb-test-build.noindex, $(BUILDDIR))" ""
-CLANG_MODULE_CACHE_DIR := $(BUILDDIR)/module-cache
-else
 CLANG_MODULE_CACHE_DIR := $(shell echo "$(BUILDDIR)" | sed 's/lldb-test-build.noindex.*/lldb-test-build.noindex\/module-cache-clang/')
-endif
 
-ifeq "$(CLANG_MODULE_CACHE_DIR)" ""
-$(error failed to set the shared clang module cache dir)
+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)




More information about the lldb-commits mailing list