diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2011-07-01 16:07:54 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2011-07-01 16:07:54 +0000 |
| commit | 942dc67fc01b115c820f4b5330e3dfa610bf6b5d (patch) | |
| tree | af2960a155e99d82997ac4be7a18122efeb2e32a /Mk | |
| parent | - Update to 1.4.11 (diff) | |
- Fix QMAKE_BASE_COMPILER detection when `cc` is (actually, will be)
linked to Clang.
- Mute the (harmless) error message "cc: not found" when `cc` is not
in PATH.
Discussed with: makc
Notes
Notes:
svn path=/head/; revision=276792
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.qt.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 384c772dbc12..a23b2fa4aee5 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -112,7 +112,7 @@ QMAKEFLAGS+= QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \ # # Translate `c++` to its real name and select the appropriate mkspec. # -QMAKE_BASE_COMPILER!= cc --version | head -1 | sed -E 's/.+\(([^)]+)\).+/\1/' | cut -d " " -f 1 +QMAKE_BASE_COMPILER!= cc --version 2> /dev/null | awk 'NR == 1 { gsub(/[()]/, "", $2); print $2 }' .if ${QMAKE_BASE_COMPILER:L} == "gcc" QMAKE_BASE_COMPILER= g++ .endif |