diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2013-10-11 11:05:37 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-11 12:04:40 -0700 |
| commit | d3aceafdaa4e2aee060a09878f750718bb1e7df4 (patch) | |
| tree | 7074b30673ad21e9c34b1422fb2733d6debafd57 /subsurface-install.pri | |
| parent | 84549b891fc964f202e6825dcb17628c8cb100f5 (diff) | |
| download | subsurface-d3aceafdaa4e2aee060a09878f750718bb1e7df4.tar.gz | |
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>
Diffstat (limited to 'subsurface-install.pri')
| -rw-r--r-- | subsurface-install.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subsurface-install.pri b/subsurface-install.pri index 5fcc15883..ead1fd221 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -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)) { |