Commits
Ken Cunningham authored 55f9ca7ab74
1 1 | diff --git mkspecs/common/clang-mac.conf mkspecs/common/clang-mac.conf |
2 2 | index 3280274f..38f0bd34 100644 |
3 3 | --- mkspecs/common/clang-mac.conf |
4 4 | +++ mkspecs/common/clang-mac.conf |
5 - | |
5 + | |
6 6 | |
7 7 | QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0 |
8 8 | |
9 9 | -QMAKE_CXXFLAGS_CXX11 += -stdlib=libc++ |
10 10 | -QMAKE_LFLAGS_CXX11 += -stdlib=libc++ |
11 11 | +QMAKE_CXXFLAGS_CXX11 += -stdlib=__MACPORTS_CXX_STDLIB__ |
12 12 | +QMAKE_LFLAGS_CXX11 += -stdlib=__MACPORTS_CXX_STDLIB__ |
13 - | +QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__ |
14 - | +QMAKE_LFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__ |
13 + | +QMAKE_CXXFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__ |
14 + | +QMAKE_LFLAGS += -stdlib=__MACPORTS_CXX_STDLIB__ |
15 + | +DEFINES += NS_BUILD_32_LIKE_64 |
15 16 | diff --git mkspecs/common/clang.conf mkspecs/common/clang.conf |
16 17 | index d58b44b2..2ad29ef3 100644 |
17 18 | --- mkspecs/common/clang.conf |
18 19 | +++ mkspecs/common/clang.conf |
19 20 | |
20 21 | |
21 22 | QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc |
22 23 | |
23 24 | -QMAKE_CC = clang |
24 25 | -QMAKE_CXX = clang++ |