Skip to content

Commit f88d2c8

Browse files
authored
fixed #13066 - Makefile: need to use override when appending to variable specified on the command-line (danmar#6765)
see https://www.gnu.org/software/make/manual/make.html#Override-Directive
1 parent 55c67a3 commit f88d2c8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ifndef CPPFLAGS
4040
endif
4141

4242
ifdef FILESDIR
43-
CPPFLAGS+=-DFILESDIR=\"$(FILESDIR)\"
43+
override CPPFLAGS+=-DFILESDIR=\"$(FILESDIR)\"
4444
endif
4545

4646
RDYNAMIC=-rdynamic

tools/dmake/dmake.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ int main(int argc, char **argv)
599599

600600
// explicit files dir..
601601
fout << "ifdef FILESDIR\n"
602-
<< " CPPFLAGS+=-DFILESDIR=\\\"$(FILESDIR)\\\"\n"
602+
<< " override CPPFLAGS+=-DFILESDIR=\\\"$(FILESDIR)\\\"\n"
603603
<< "endif\n\n";
604604

605605
// enable backtrac

0 commit comments

Comments
 (0)