mirror of https://github.com/qt/qtbase.git
Swap the GCC and Clang versions of supported FreeBSD mkspecs
Modern FreeBSD doesn't come with GCC by default anymore and doesn't even provide the "gcc" or "g++" falback that OS X does. So there's no point in keeping the freebsd-clang mkspec in unsupported/ since it's the only one that works, or keeping the freebsd-g++* ones outside, as they won't compile. I'm not removing the GCC mkspecs because you can still install GCC from the ports tree. [ChangeLog][FreeBSD] The "freebsd-clang" mkspec is no longer in the unsupported/ subdir. If you have scripts you use to build Qt, you'll need to update them to say -platform freebsd-clang or remove the -platform argument. Change-Id: I7a9e11d7b64a4cc78e24ffff142dfc11d3aabb1e Reviewed-by: Raphael Kubo da Costa <rakuco@FreeBSD.org> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
parent
ccf74b5928
commit
628d3b7d3a
|
@ -2854,7 +2854,7 @@ if [ -z "$PLATFORM" ]; then
|
|||
PLATFORM=ultrix-g++
|
||||
;;
|
||||
FreeBSD:*)
|
||||
PLATFORM=freebsd-g++
|
||||
PLATFORM=freebsd-clang
|
||||
PLATFORM_NOTES="
|
||||
- Also available for FreeBSD: freebsd-icc
|
||||
"
|
||||
|
|
|
@ -30,7 +30,7 @@ QMAKE_OBJCOPY = objcopy
|
|||
QMAKE_NM = nm -P
|
||||
QMAKE_RANLIB =
|
||||
|
||||
include(../../common/gcc-base-unix.conf)
|
||||
include(../../common/clang.conf)
|
||||
include(../common/gcc-base-unix.conf)
|
||||
include(../common/clang.conf)
|
||||
|
||||
load(qt_config)
|
|
@ -5,7 +5,7 @@
|
|||
MAKEFILE_GENERATOR = UNIX
|
||||
QMAKE_PLATFORM = freebsd bsd
|
||||
|
||||
include(../common/unix.conf)
|
||||
include(../../common/unix.conf)
|
||||
|
||||
QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
|
||||
|
||||
|
@ -29,6 +29,6 @@ QMAKE_OBJCOPY = objcopy
|
|||
QMAKE_NM = nm -P
|
||||
QMAKE_RANLIB =
|
||||
|
||||
include(../common/gcc-base-unix.conf)
|
||||
include(../common/g++-unix.conf)
|
||||
include(../../common/gcc-base-unix.conf)
|
||||
include(../../common/g++-unix.conf)
|
||||
load(qt_config)
|
|
@ -31,4 +31,4 @@
|
|||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "../../freebsd-g++/qplatformdefs.h"
|
||||
#include "../../freebsd-clang/qplatformdefs.h"
|
|
@ -5,7 +5,7 @@
|
|||
MAKEFILE_GENERATOR = UNIX
|
||||
QMAKE_PLATFORM = freebsd bsd
|
||||
|
||||
include(../common/unix.conf)
|
||||
include(../../common/unix.conf)
|
||||
|
||||
QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
|
||||
|
||||
|
@ -29,8 +29,8 @@ QMAKE_OBJCOPY = objcopy
|
|||
QMAKE_NM = nm -P
|
||||
QMAKE_RANLIB =
|
||||
|
||||
include(../common/gcc-base-unix.conf)
|
||||
include(../common/g++-unix.conf)
|
||||
include(../../common/gcc-base-unix.conf)
|
||||
include(../../common/g++-unix.conf)
|
||||
|
||||
# Redefined here because g++-base.conf sets QMAKE_CC and QMAKE_CXX
|
||||
# to gcc and g++, respectively.
|
|
@ -31,4 +31,4 @@
|
|||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "../freebsd-g++/qplatformdefs.h"
|
||||
#include "../../freebsd-clang/qplatformdefs.h"
|
Loading…
Reference in New Issue