Commit 3f6669c8 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1834678 - Upgrade meson to 1.1.0. r=gfx-reviewers,gw 

The old version that is currently used doesn't support lld for mac, and
tries to pass it flags for BFD ld (e.g. --as-needed).

For some reason meson checks fail because of some CFLAGS not being used
during the checks being reported as an error, so we make those errors
quiet.

Differential Revision: https://phabricator.services.mozilla.com/D178899
parent d4131996

gfx/wr/ci-scripts/install-meson.sh

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ set -o nounset 
set -o pipefail

set -o xtrace



MESON_VER=0.55.1

MESON_VER=1.1.0

MESON_BASE_URL="https://github.com/mesonbuild/meson/releases/download"



curl -L ${MESON_BASE_URL}/${MESON_VER}/meson-${MESON_VER}.tar.gz -o meson.tar.gz

taskcluster/scripts/misc/wr-macos-cross-build-setup.sh

+2 −2
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ export ZLIB_LIBS="-L${MACOS_SYSROOT}/usr/lib -lz" 
# target-specific CFLAGS/CXXFLAGS variables, to not break any host builds.

LDPATH="${MOZ_FETCHES_DIR}/cctools/bin/${TARGET_TRIPLE}-ld"

export CC="${CLANGDIR}/bin/clang"

TARGET_CFLAGS="-fuse-ld=${LDPATH} -target ${TARGET_TRIPLE} -mmacosx-version-min=10.7 --rtlib=compiler-rt --sysroot ${MACOS_SYSROOT}"

TARGET_CFLAGS="-fuse-ld=${LDPATH} -target ${TARGET_TRIPLE} -mmacosx-version-min=10.7 --rtlib=compiler-rt --sysroot ${MACOS_SYSROOT} -Qunused-arguments"

export CFLAGS_${TARGET_TRIPLE//-/_}="${TARGET_CFLAGS}"

export CXX="${CLANGDIR}/bin/clang++"

TARGET_CXXFLAGS="-fuse-ld=${LDPATH} -target ${TARGET_TRIPLE} -mmacosx-version-min=10.7 --rtlib=compiler-rt --sysroot ${MACOS_SYSROOT} -stdlib=libc++"

TARGET_CXXFLAGS="-fuse-ld=${LDPATH} -target ${TARGET_TRIPLE} -mmacosx-version-min=10.7 --rtlib=compiler-rt --sysroot ${MACOS_SYSROOT} -stdlib=libc++ -Qunused-arguments"

export CXXFLAGS_${TARGET_TRIPLE//-/_}="${TARGET_CXXFLAGS}"

export AR="${CLANGDIR}/bin/llvm-ar"