diff --git a/data/macos/build-deps-new.sh b/data/macos/build-deps-new.sh index 66bc6332c..4eb2cbf26 100755 --- a/data/macos/build-deps-new.sh +++ b/data/macos/build-deps-new.sh @@ -489,7 +489,7 @@ fi if [ ! -f sip-${SIP_VERSION}/build-done ]; then cd sip-${SIP_VERSION} - python3 configure.py + python3 configure.py --sip-module PyQt5.sip make ${MAKE_ARGS} make install touch build-done @@ -506,7 +506,7 @@ fi if [ ! -f PyQt5_gpl-${PYQT5_VERSION}/build-done ]; then cd PyQt5_gpl-${PYQT5_VERSION} - python3 configure.py --confirm-license -c + python3 configure.py --concatenate --confirm-license -c make ${MAKE_ARGS} make install touch build-done diff --git a/data/macos/env.sh b/data/macos/env.sh index 07b7f3c48..ce4cfc9af 100644 --- a/data/macos/env.sh +++ b/data/macos/env.sh @@ -10,7 +10,7 @@ export CXX=clang++ export MACOS="true" -if [ $(clang -v 2>&1 | sed -n 's/.*version \([0-9]\).*/\1/p') -lt 9 ]; then +if [ $(clang -v 2>&1 | grep version | cut -d' ' -f4 | cut -d'.' -f1) -lt 9 ]; then export MACOS_OLD="true" fi diff --git a/source/Makefile.mk b/source/Makefile.mk index 32d7e29ee..a1b9c1c20 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -107,7 +107,8 @@ BASE_OPTS = -O3 -ffast-math -mtune=generic -msse -msse2 -mfpmath=sse -fdata-sec ifeq ($(MACOS),true) # MacOS linker flags -LINK_OPTS = -fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs +BASE_FLAGS += -Wno-deprecated-declarations +LINK_OPTS = -fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs else # Common linker flags LINK_OPTS = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--as-needed