diff options
author | dos-reis <gdr@axiomatics.org> | 2011-07-04 22:14:01 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2011-07-04 22:14:01 +0000 |
commit | 096c66f423ee3b18b96025c85576f16cf08cabf5 (patch) | |
tree | 3269dfbd28787da9ae09295b3203c0b0ec6d382c | |
parent | e1989d674ccc83e2ca332b1dad30cefff007c32b (diff) | |
download | open-axiom-096c66f423ee3b18b96025c85576f16cf08cabf5.tar.gz |
* configure.ac: Use macx-g++ spec for QT when building for darwin
host using C++ compiler for GNU.
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | configure | 8 | ||||
-rw-r--r-- | configure.ac | 8 |
3 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2011-07-04 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * configure.ac: Use macx-g++ spec for QT when building for darwin + host using C++ compiler for GNU. + 2011-06-30 Gabriel Dos Reis <gdr@cs.tamu.edu> * config/open-axiom.m4 (OPENAXIOM_CHECK_GMP): New. @@ -23726,7 +23726,13 @@ fi ## Set up Makefile for QT-based gui if test x$oa_has_qt = xyes; then - (cd src/gui && $OA_QT_QMAKE -makefile gui.pro) + oa_qmake_spec= + case $host,$GXX in + *darwin*,yes) + oa_qmake_spec="-spec macx-g++" + ;; + esac + (cd src/gui && $OA_QT_QMAKE $oa_qmake_spec -makefile gui.pro) fi ## Generate rules to extrad SPAD type definitions from pamphlets. diff --git a/configure.ac b/configure.ac index f48b2b0e..fa8454f4 100644 --- a/configure.ac +++ b/configure.ac @@ -133,7 +133,13 @@ AC_OUTPUT ## Set up Makefile for QT-based gui if test x$oa_has_qt = xyes; then - (cd src/gui && $OA_QT_QMAKE -makefile gui.pro) + oa_qmake_spec= + case $host,$GXX in + *darwin*,yes) + oa_qmake_spec="-spec macx-g++" + ;; + esac + (cd src/gui && $OA_QT_QMAKE -makefile $oa_qmake_spec gui.pro) fi ## Generate rules to extrad SPAD type definitions from pamphlets. |