diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2018-01-07 15:03:08 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2018-01-07 15:03:08 +0000 |
| commit | 9c3d7007b2faa8d220641a13348618ed2a3d2945 (patch) | |
| tree | 80ac575fee9029327d2f4724ab275a63514b8c44 /Mk | |
| parent | Rework OPTIONs handling in Qt 5.9.3. (diff) | |
Correctly pass -platform to qtbase's configure script when CXX is an absolute path.
With the update to Qt 5.9.3, the configure script and qmake expect an mkspec
name, not an absolute path, which is why r458293 switched to using
${QMAKESPEC:T}.
However, the :T modifier breaks things when CXX is set to an absolute path
instead of just "c++", QMAKE_COMPILER is a shell string that will be evaluated
only after make invokes `configure' with CONFIGURE_ARGS. In other words, we end
up turning something like
$$(ccver="$$(/usr/bin/c++ --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac)
into
/c++ --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac)
which is obviously invalid.
We now just avoid being too smart and set a separate variable called
QMAKESPECNAME, which contains only the mkspec name and that we use both when
setting CONFIGURE_ARGS as well as to create QMAKESPEC.
PR: 224971
Notes
Notes:
svn path=/head/; revision=458339
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.qt.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 85d11ac85694..658c8beb04b2 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -135,7 +135,7 @@ CONFIGURE_ARGS+=-fast \ -demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos . else CONFIGURE_ARGS+=-nomake examples -nomake tests \ - -platform ${QMAKESPEC:T} \ + -platform ${QMAKESPECNAME} \ -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \ -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \ -qmldir ${PREFIX}/${QT_QMLDIR_REL} \ @@ -261,7 +261,8 @@ UIC?= ${QT_BINDIR}/uic QMAKE?= ${QT_BINDIR}/qmake # Needed to redefine the qmake target for internal Qt configuration. _QMAKE?= ${QMAKE} -QMAKESPEC?= ${QT_MKSPECDIR}/freebsd-${QMAKE_COMPILER} +QMAKESPECNAME?= freebsd-${QMAKE_COMPILER} +QMAKESPEC?= ${QT_MKSPECDIR}/${QMAKESPECNAME} # The whole Qt distribution should be built with the same compiler, but it's # better to support custom settings. Dereferencing the detection allows to |