diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh index 738fd976b10119cf5fbcac5522e92d415a61d27d..44a9504af914140283de19a94dac4dc00c9d3233 100755 --- a/ShellB3/shallbethree.sh +++ b/ShellB3/shallbethree.sh @@ -6586,12 +6586,11 @@ mk_qt5() { if [ ${MACOSX_DEPLOYMENT_TARGET} == 10.12 ] ; then export QT5USEVER=${QT5OLDVER} export EXTRAPARMS="${EXTRAPARMS} -skip qtlocation" - elif [ ${MACOSX_DEPLOYMENT_TARGET} == 10.13 ] ; then - #export QT5USEVER=${QT5VER} - export QT5USEVER=${QT5OLDVER} - export EXTRAPARMS="${EXTRAPARMS} -skip qtlocation" else export QT5USEVER=${QT5NEWVER} + if [ ${MACOSX_DEPLOYMENT_TARGET} == 10.13 ] ; then #chromium wants to use metal for 10.14 or newer + export EXTRAPARMS="${EXTRAPARMS} -skip qtwebengine" + fi fi export EXTRAPARMS="${EXTRAPARMS} -no-openssl -securetransport" export EXTRAPARMS="${EXTRAPARMS} -sdk macosx${MACOSX_DEPLOYMENT_TARGET} QMAKE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}" @@ -8091,6 +8090,7 @@ PATCH fi fi + CFLAGS="$( omitparameter -isysroot 1 $CFLAGS )" CXXFLAGS="$( omitparameter -isysroot 1 $CXXFLAGS )" LDFLAGS="$( omitparameter -isysroot 1 $LDFLAGS )" \ SB3BUILDFLAGS="$( omitparameter --with-sysroot=${SYSROOT} 0 $(omitparameter --build=${PLATFORM} 0 ${SB3BUILDFLAGS} ) )" \ _configure_make_install Qt5 src/optional/qt-${QT5USEVER}.tar.* qt-${QT5USEVER} ${EXTRAPARMS} "$@" || oops "Failed to build Qt5"