From 61cc14ae77b114624d087c3cc012a292e1a5bd0c Mon Sep 17 00:00:00 2001 From: Paul Cadman Date: Fri, 24 Nov 2023 18:12:44 +0000 Subject: [PATCH] Do not expand variables like $(CC) when writing to a dependency file --- runtime/Makefile.generic | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/Makefile.generic b/runtime/Makefile.generic index a8f5cf0218..9a085b7af3 100644 --- a/runtime/Makefile.generic +++ b/runtime/Makefile.generic @@ -240,23 +240,23 @@ $(CLEXSOURCES) : $(BUILDDIR)%.c : %.lex $(CDEPENDS) : $(BUILDDIR)%.d : %.c $(CC) $(CDEPFLAGS) -MM -MT $(patsubst %.c,$(BUILDDIR)%.o,$<) $< > $@ - printf "\t$(CC) -c $(CFLAGS) -o $(patsubst %.c,$(BUILDDIR)%.o,$<) $<\n" >> $@ + printf "\t\$$(CC) -c \$$(CFLAGS) -o $(patsubst %.c,$(BUILDDIR)%.o,$<) $<\n" >> $@ $(CYLDEPENDS) : $(BUILDDIR)%.d : $(BUILDDIR)%.c $(CC) $(CDEPFLAGS) -MM -MT $(patsubst %.c,%.o,$<) $< > $@ - printf "\t$(CC) -c $(CFLAGS) -o $(patsubst %.c,%.o,$<) $<\n" >> $@ + printf "\t\$$(CC) -c \$$(CFLAGS) -o $(patsubst %.c,%.o,$<) $<\n" >> $@ $(CPPDEPENDS) : $(BUILDDIR)%.d : %.cpp $(CXX) $(CXXDEPFLAGS) -MM -MT $(patsubst %.cpp,$(BUILDDIR)%.o,$<) $< > $@ - printf "\t$(CXX) -c $(CXXFLAGS) -o $(patsubst %.cpp,$(BUILDDIR)%.o,$<) $<\n" >> $@ + printf "\t\$$(CXX) -c \$$(CXXFLAGS) -o $(patsubst %.cpp,$(BUILDDIR)%.o,$<) $<\n" >> $@ $(CXXDEPENDS) : $(BUILDDIR)%.d : %.cxx $(CXX) $(CXXDEPFLAGS) -MM -MT $(patsubst %.cxx,$(BUILDDIR)%.o,$<) $< > $@ - printf "\t$(CXX) -c $(CXXFLAGS) -o $(patsubst %.cxx,$(BUILDDIR)%.o,$<) $<\n" >> $@ + printf "\t\$$(CXX) -c \$$(CXXFLAGS) -o $(patsubst %.cxx,$(BUILDDIR)%.o,$<) $<\n" >> $@ $(CCDEPENDS) : $(BUILDDIR)%.d : %.cc $(CXX) $(CXXDEPFLAGS) -MM -MT $(patsubst %.cc,$(BUILDDIR)%.o,$<) $< > $@ - printf "\t$(CXX) -c $(CXXFLAGS) -o $(patsubst %.cc,$(BUILDDIR)%.o,$<) $<\n" >> $@ + printf "\t\$$(CXX) -c \$$(CXXFLAGS) -o $(patsubst %.cc,$(BUILDDIR)%.o,$<) $<\n" >> $@ $(CPROGRAMS) : % : $(ALLOBJECTS) $(CCLD) -o $@ $@.o $(OBJECTS) $(CCLDFLAGS)