Using gcc 4.4 on CentOS 5.5

[tools/install.git] / config_files / qscintilla.sh

diff --git a/config_files/qscintilla.sh b/config_files/qscintilla.sh
index a23fafadd7b9ec7cdcf34bb0deb4bbcbdc242fc1..3801b7bc8855f01aca98f0c94d053fb4af47c4ee 100755 (executable)
--- a/config_files/qscintilla.sh
+++ b/config_files/qscintilla.sh
@@ -98,16 +98,25 @@ unset INSTALL_ROOT
 
 cd ${PRODUCT_SRC_DIR}/Qt4Qt5
 
+gen_qmake_cache ${PRODUCT_SRC_DIR}/Qt4Qt5
 qmake -o Makefile qscintilla.pro
 check_job ${PRODUCT_DIR}/MAKE.LOG make 
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
 if [ "${PYQT4_ROOT_DIR}" != "" ] ; then
     # install Python wrapping for QScintilla only if pre-installed version of PyQt is used
+    local QSCI_PY_CONFIGURE_OPTIONS="-a ${PRODUCT_DIR}/qsci -n ${PRODUCT_DIR}/include -o ${PRODUCT_DIR}/lib -p 4 -d ${PYQT4_ROOT_DIR}/PyQt4 -v ${PYQT4_ROOT_DIR}/sip"
+    if [ "${CXX}" != "" ] ; then
+        # custom gcc
+        false && QSCI_PY_CONFIGURE_OPTIONS="${QSCI_PY_CONFIGURE_OPTIONS} CC=${CC} CXX=${CXX} LINK=${CXX} LINK_SHLIB=${CXX}"
+    fi                                                                                                                                                                                                        
     cd ${PRODUCT_SRC_DIR}/Python
-    check_job ${PRODUCT_DIR}/PYCONFIGURE.LOG python configure.py -a ${PRODUCT_DIR}/qsci \
-       -n ${PRODUCT_DIR}/include -o ${PRODUCT_DIR}/lib -p 4 \
-       -d ${PYQT4_ROOT_DIR}/PyQt4 -v ${PYQT4_ROOT_DIR}/sip
+    cat >> ${PRODUCT_DIR}/PYCONFIGURE.LOG <<EOF
+-------------------
+Used options: ${QSCI_PY_CONFIGURE_OPTIONS}
+-------------------
+EOF
+    check_job ${PRODUCT_DIR}/PYCONFIGURE.LOG python configure.py ${QSCI_PY_CONFIGURE_OPTIONS}
     check_job ${PRODUCT_DIR}/PYMAKE.LOG make 
     check_job ${PRODUCT_DIR}/PYMAKEINSTALL.LOG make install
 fi