From 0321f64b7232208ea6700d69e18f9fb4085b7e89 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sun, 23 Aug 2015 17:45:45 +0200 Subject: [PATCH] build_style qmake: generalized CFLAGS/LDFLAGS passing --- common/build-style/qmake.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/common/build-style/qmake.sh b/common/build-style/qmake.sh index 8eacad54c7..7462c7f476 100644 --- a/common/build-style/qmake.sh +++ b/common/build-style/qmake.sh @@ -2,13 +2,12 @@ # This helper is for templates using Qt4/Qt5 qmake. # do_configure() { - if [ -n "$build_pie" ]; then - qmake ${configure_args} \ - QMAKE_LFLAGS_SHLIB+=" -Wl,-z,now" \ - QMAKE_LFLAGS_PLUGIN+=" -Wl,-z,now" - else - qmake ${configure_args} - fi + qmake ${configure_args} \ + PREFIX=/usr \ + LIB=/usr/lib \ + QMAKE_CFLAGS="${CFLAGS}" \ + QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_LFLAGS="${LDFLAGS}" } do_build() {