tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

build-style qmake: don't use configure_script

Browse Source 
When running do_configure(), configure_script is already set to
./configure and we can't set another default.
Thus always use qmake directly.
This commit is contained in:
Jürgen Buchmüller
2015-08-21 12:00:26 +02:00
parent 096b4635fb
commit cabc226b2a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/build-style/qmake.sh
View File

@@ -2,14 +2,12 @@
# This helper is for templates using Qt4/Qt5 qmake. # This helper is for templates using Qt4/Qt5 qmake.
# #
do_configure() { do_configure() {
configure_script=qmake
if [ -n "$build_pie" ]; then if [ -n "$build_pie" ]; then
${configure_script} ${configure_args} \ qmake ${configure_args} \
QMAKE_LFLAGS_SHLIB+=" -Wl,-z,now" \ QMAKE_LFLAGS_SHLIB+=" -Wl,-z,now" \
QMAKE_LFLAGS_PLUGIN+=" -Wl,-z,now" QMAKE_LFLAGS_PLUGIN+=" -Wl,-z,now"
else else
${configure_script} ${configure_args} qmake ${configure_args}
fi fi
} }