diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 21:06:47 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 21:06:47 +0200 |
commit | 42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4 (patch) | |
tree | a7f25b1d335a834a7c3ae104cee913ef3a4dd4fb /configure | |
parent | 4ee4fc18b4067b90efa46ca9baba74f53b54d9ec (diff) | |
parent | 168ff3419f256fdb35b586275d293fc0cd773fe1 (diff) | |
download | qtbase-42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4.tar.gz |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl5.15
Change-Id: Iaff6b55275e50d19973e1020853d8622587069f9
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -474,6 +474,10 @@ while [ "$#" -gt 0 ]; do VAR=`echo $1 | sed 's,^-\(.*\),\1,'` VAL="yes" ;; + # Special case for macOS universal builds + QMAKE_APPLE_DEVICE_ARCHS=*) + QMAKE_APPLE_DEVICE_ARCHS=`echo $1 | sed 's,^QMAKE_APPLE_DEVICE_ARCHS=\(.*\),\1,'` + ;; # most options don't need processing in the configure script, skip them. qmake will do the real validation *) shift @@ -781,6 +785,10 @@ setBootstrapVariable() if [ "$BUILD_ON_MAC" = "yes" ]; then echo "EXTRA_CXXFLAGS += -MMD" >> "$mkfile" + for arch in $QMAKE_APPLE_DEVICE_ARCHS; do + echo "EXTRA_CXXFLAGS += -arch $arch" >> "$mkfile" + echo "EXTRA_LFLAGS += -arch $arch" >> "$mkfile" + done cat "$in_mkfile" >> "$mkfile" echo "-include \$(notdir \$(DEPEND_SRC:%.cpp=%.d))" >> "$mkfile" else |