On Fri, 28 Jun 2013 10:20:24 -0500, William Kyngesburye
<wokl...@kyngchaos.com> wrote:
> Though I see now what you mean by those lines in configure.py - whatever
> you give for --spec will be overridden by that 'darwin' if block. And
if
> it isn't macx-xcode it defaults to whatever Qt5 was compiled with,
probably
> clang++.
The attached patch should fix it.
Phil
diff -r e74dbc5074d0 Makefile
--- a/Makefile Fri Jun 28 16:51:28 2013 +0100
+++ b/Makefile Fri Jun 28 17:12:11 2013 +0100
@@ -50,7 +50,7 @@
@SIPBIN=$(MYSIPBIN) ./build.py prepare
config:
- (cd PyQt && $(MYPYTHONBIN) configure.py --confirm-license --qmake=$(QT_QMAKE) --sip=$(MYSIPBIN) -c -j$(PARTS) --debug)
+ (cd PyQt && $(MYPYTHONBIN) configure.py --confirm-license --qmake=$(QT_QMAKE) --sip=$(MYSIPBIN) -c -j$(PARTS) --debug --spec macx-llvm)
config-consolidated:
(cd PyQt && $(MYPYTHONBIN) configure.py --confirm-license --qmake=$(QT_QMAKE) --sip=$(MYSIPBIN) -c -j$(PARTS) --consolidate)
diff -r e74dbc5074d0 lib/configure.py
--- a/lib/configure.py Fri Jun 28 16:51:28 2013 +0100
+++ b/lib/configure.py Fri Jun 28 17:12:11 2013 +0100
@@ -473,9 +473,11 @@
self.qsci_api_dir = os.path.join(qt_config.QT_INSTALL_DATA, 'qsci')
self.qsci_api = os.path.isdir(self.qsci_api_dir)
- # The binary MacOS/X Qt installer defaults to XCode. If this is what
- # we might have then use macx-clang.
- if sys.platform == 'darwin':
+ if opts.qmakespec is not None:
+ self.qmake_spec = opts.qmakespec
+ elif sys.platform == 'darwin':
+ # The binary MacOS/X Qt installer defaults to XCode. If this is
+ # what we might have then use macx-clang.
if qt_config.QMAKE_SPEC == 'macx-xcode':
# This will exist (and we can't check anyway).
self.qmake_spec = 'macx-clang'
@@ -528,9 +530,6 @@
if opts.pyuicinterpreter is not None:
self.pyuic_interpreter = opts.pyuicinterpreter
- if opts.qmakespec is not None:
- self.qmake_spec = opts.qmakespec
-
if opts.qsciapidir is not None:
self.qsci_api_dir = opts.qsciapidir
_______________________________________________
PyQt mailing list PyQt@riverbankcomputing.com
http://www.riverbankcomputing.com/mailman/listinfo/pyqt
