1 |
Signed-off-by: Michał Górny <mgorny@g.o> |
2 |
--- |
3 |
eclass/qmake-utils.eclass | 28 +++++----------------------- |
4 |
1 file changed, 5 insertions(+), 23 deletions(-) |
5 |
|
6 |
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass |
7 |
index a4be44fa65a5..a86ce1fbabb8 100644 |
8 |
--- a/eclass/qmake-utils.eclass |
9 |
+++ b/eclass/qmake-utils.eclass |
10 |
@@ -1,4 +1,4 @@ |
11 |
-# Copyright 1999-2021 Gentoo Authors |
12 |
+# Copyright 1999-2022 Gentoo Authors |
13 |
# Distributed under the terms of the GNU General Public License v2 |
14 |
|
15 |
# @ECLASS: qmake-utils.eclass |
16 |
@@ -102,28 +102,10 @@ eqmake5() { |
17 |
|
18 |
ebegin "Running qmake" |
19 |
|
20 |
- "$(qt5_get_bindir)"/qmake \ |
21 |
- -makefile \ |
22 |
- QMAKE_AR="$(tc-getAR) cqs" \ |
23 |
- QMAKE_CC="$(tc-getCC)" \ |
24 |
- QMAKE_LINK_C="$(tc-getCC)" \ |
25 |
- QMAKE_LINK_C_SHLIB="$(tc-getCC)" \ |
26 |
- QMAKE_CXX="$(tc-getCXX)" \ |
27 |
- QMAKE_LINK="$(tc-getCXX)" \ |
28 |
- QMAKE_LINK_SHLIB="$(tc-getCXX)" \ |
29 |
- QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \ |
30 |
- QMAKE_RANLIB= \ |
31 |
- QMAKE_STRIP= \ |
32 |
- QMAKE_CFLAGS="${CFLAGS}" \ |
33 |
- QMAKE_CFLAGS_RELEASE= \ |
34 |
- QMAKE_CFLAGS_DEBUG= \ |
35 |
- QMAKE_CXXFLAGS="${CXXFLAGS}" \ |
36 |
- QMAKE_CXXFLAGS_RELEASE= \ |
37 |
- QMAKE_CXXFLAGS_DEBUG= \ |
38 |
- QMAKE_LFLAGS="${LDFLAGS}" \ |
39 |
- QMAKE_LFLAGS_RELEASE= \ |
40 |
- QMAKE_LFLAGS_DEBUG= \ |
41 |
- "$@" |
42 |
+ local -a args |
43 |
+ mapfile -t args <<<"$(qt5_get_qmake_args)" |
44 |
+ # NB: we're passing literal quotes in but qmake doesn't seem to mind |
45 |
+ "$(qt5_get_bindir)"/qmake -makefile "${args[@]}" "$@" |
46 |
|
47 |
if ! eend $? ; then |
48 |
echo |
49 |
-- |
50 |
2.35.1 |