Author: Adrian Prantl Date: 2026-08-13T10:57:51-07:00 New Revision: dbac58277733fb87f5df02acf688b92b4b378cf3
URL: https://github.com/llvm/llvm-project/commit/dbac58277733fb87f5df02acf688b92b4b378cf3 DIFF: https://github.com/llvm/llvm-project/commit/dbac58277733fb87f5df02acf688b92b4b378cf3.diff LOG: [LLDB] Fix tool dependency tracking on windows (#215927) On Windows $(CXX) is converted into "$(CXX)" which doesn't work as a path as needed by dependency tracking. Separate the two uses. Added: Modified: lldb/packages/Python/lldbsuite/test/make/Makefile.rules Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index f376c0b0ed252..feb0f3aa36856 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -162,6 +162,9 @@ override LD := $(CC) # A kind of linker. It always gets retrieved from CC. override LDC := $(CC_TYPE) +# The bare path to the C++ compiler before it is converted into a shell word on windows. +CXX_PATH := $(CXX) + ifeq "$(HOST_OS)" "Windows_NT" # This function enframes the full path with the platform specific quotes. This is necessary to run the c++ executable # properly under 'sh' on Windows host (prevent the path breakage because of Windows style path separators). @@ -667,20 +670,20 @@ endif #---------------------------------------------------------------------- ifneq "$(PCH_OUTPUT)" "" -$(PCH_OUTPUT) : $(PCH_CXX_SOURCE) $(call tool_prereq,$(CXX)) +$(PCH_OUTPUT) : $(PCH_CXX_SOURCE) $(call tool_prereq,$(CXX_PATH)) $(CXX) $(CXXFLAGS) -x c++-header -o $@ $< endif %.o: %.c %.d $(call tool_prereq,$(CC)) $(CC) $(CFLAGS) -MT $@ -MD -MP -MF $*.d -c -o $@ $< -%.o: %.cpp %.d $(PCH_OUTPUT) $(call tool_prereq,$(CXX)) +%.o: %.cpp %.d $(PCH_OUTPUT) $(call tool_prereq,$(CXX_PATH)) $(CXX) $(PCHFLAGS) $(CXXFLAGS) -MT $@ -MD -MP -MF $*.d -c -o $@ $< %.o: %.m %.d $(call tool_prereq,$(CC)) $(CC) $(CFLAGS) -MT $@ -MD -MP -MF $*.d -c -o $@ $< -%.o: %.mm %.d $(call tool_prereq,$(CXX)) +%.o: %.mm %.d $(call tool_prereq,$(CXX_PATH)) $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $*.d -c -o $@ $< #---------------------------------------------------------------------- _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
