mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-01 01:13:24 +00:00
Fix non-expansion of some Makefile variables
Apparently SED isn't set on Windows-native Makefiles. And for some reason, $(CC) wasn't getting expanded properly -- it expanded to "cc", even though it is set at the beginning of the Makefile to "gcc". Reported-by: Lubomir I. Ivanov Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
84549b891f
commit
d3aceafdaa
1 changed files with 2 additions and 2 deletions
|
@ -53,8 +53,8 @@ mac {
|
|||
install.depends += qt_conf
|
||||
|
||||
!win32-msvc* {
|
||||
#!equals($$QMAKE_HOST.os, "Windows"): dlls.commands += OBJDUMP=`$(CC) -dumpmachine`-objdump
|
||||
dlls.commands += PATH=\$\$PATH:`$(CC) -print-search-dirs | $(SED) -nE \'/^libraries: =/{s///;s,/lib/?(:|\\\$\$),/bin\\1,g;p;q;}\'`
|
||||
#!equals($$QMAKE_HOST.os, "Windows"): dlls.commands += OBJDUMP=`$$QMAKE_CC -dumpmachine`-objdump
|
||||
dlls.commands += PATH=\$\$PATH:`$$QMAKE_CC -print-search-dirs | sed -nE \'/^libraries: =/{s///;s,/lib/?(:|\\\$\$),/bin\\1,g;p;q;}\'`
|
||||
dlls.commands += perl $$PWD/scripts/win-ldd.pl $(DESTDIR_TARGET)
|
||||
|
||||
for(plugin, $$list($$DEPLOYMENT_PLUGIN)) {
|
||||
|
|
Loading…
Add table
Reference in a new issue