Skip to content

fixed #13066 - Makefile: need to use override when appending to variable specified on the command-line #6765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
firewave merged 1 commit into from
Sep 18, 2024
Merged

fixed #13066 - Makefile: need to use override when appending to variable specified on the command-line #6765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ifndef CPPFLAGS
endif

ifdef FILESDIR
CPPFLAGS+=-DFILESDIR=\"$(FILESDIR)\"
override CPPFLAGS+=-DFILESDIR=\"$(FILESDIR)\"
endif

RDYNAMIC=-rdynamic
Expand Down
2 changes: 1 addition & 1 deletion tools/dmake/dmake.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ int main(int argc, char **argv)

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

// enable backtrac
Expand Down