diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-01-29 11:20:50 -0800 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2016-02-02 19:23:53 +0000 |
| commit | 628d3b7d3a5646d4d1503c1c0fdef0e51bc5129b (patch) | |
| tree | 1acabc4a8aea6bea5630e1f234ae4a880f06d953 /mkspecs | |
| parent | ccf74b592809e0c5a613eff27d6431a4c659e368 (diff) | |
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>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/freebsd-clang/qmake.conf (renamed from mkspecs/unsupported/freebsd-clang/qmake.conf) | 4 | ||||
| -rw-r--r-- | mkspecs/freebsd-clang/qplatformdefs.h (renamed from mkspecs/freebsd-g++/qplatformdefs.h) | 0 | ||||
| -rw-r--r-- | mkspecs/unsupported/freebsd-g++/qmake.conf (renamed from mkspecs/freebsd-g++/qmake.conf) | 6 | ||||
| -rw-r--r-- | mkspecs/unsupported/freebsd-g++/qplatformdefs.h (renamed from mkspecs/unsupported/freebsd-clang/qplatformdefs.h) | 2 | ||||
| -rw-r--r-- | mkspecs/unsupported/freebsd-g++46/qmake.conf (renamed from mkspecs/freebsd-g++46/qmake.conf) | 6 | ||||
| -rw-r--r-- | mkspecs/unsupported/freebsd-g++46/qplatformdefs.h (renamed from mkspecs/freebsd-g++46/qplatformdefs.h) | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/mkspecs/unsupported/freebsd-clang/qmake.conf b/mkspecs/freebsd-clang/qmake.conf index 9d9815a7b3..7f18bbb721 100644 --- a/mkspecs/unsupported/freebsd-clang/qmake.conf +++ b/mkspecs/freebsd-clang/qmake.conf @@ -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) diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-clang/qplatformdefs.h index 3a39b79c41..3a39b79c41 100644 --- a/mkspecs/freebsd-g++/qplatformdefs.h +++ b/mkspecs/freebsd-clang/qplatformdefs.h diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/unsupported/freebsd-g++/qmake.conf index 282b6bdfa7..527a94870c 100644 --- a/mkspecs/freebsd-g++/qmake.conf +++ b/mkspecs/unsupported/freebsd-g++/qmake.conf @@ -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) diff --git a/mkspecs/unsupported/freebsd-clang/qplatformdefs.h b/mkspecs/unsupported/freebsd-g++/qplatformdefs.h index 68a886ed89..b52be38b4e 100644 --- a/mkspecs/unsupported/freebsd-clang/qplatformdefs.h +++ b/mkspecs/unsupported/freebsd-g++/qplatformdefs.h @@ -31,4 +31,4 @@ ** ****************************************************************************/ -#include "../../freebsd-g++/qplatformdefs.h" +#include "../../freebsd-clang/qplatformdefs.h" diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/unsupported/freebsd-g++46/qmake.conf index b930fca78b..11041dee3d 100644 --- a/mkspecs/freebsd-g++46/qmake.conf +++ b/mkspecs/unsupported/freebsd-g++46/qmake.conf @@ -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. diff --git a/mkspecs/freebsd-g++46/qplatformdefs.h b/mkspecs/unsupported/freebsd-g++46/qplatformdefs.h index 48dc4d64fb..b52be38b4e 100644 --- a/mkspecs/freebsd-g++46/qplatformdefs.h +++ b/mkspecs/unsupported/freebsd-g++46/qplatformdefs.h @@ -31,4 +31,4 @@ ** ****************************************************************************/ -#include "../freebsd-g++/qplatformdefs.h" +#include "../../freebsd-clang/qplatformdefs.h" |