fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-09 04:58:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

travis: Don't produce fat binaries on OSX

Browse source 
Trying to build fat binaries for multiple arches tickles a bug [1] in
the framework detector in meson 0.50.  Workaround this by not bothering
building for x86, which is probably no great loss :S

https://github.com/mesonbuild/meson/issues/5290
This commit is contained in:
Jon Turney 2019-04-20 01:24:21 +01:00 • committed by Adam Jackson
parent 655b1eb32e
commit 0bdfa5bc0a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/scripts/build-travis-osx.sh
View file

@ -18,7 +18,7 @@ hdiutil detach /Volumes/XQuartz-${XQUARTZ_VERSION}
export PATH="/opt/X11/bin:${PATH}" export PATH="/opt/X11/bin:${PATH}"
export PKG_CONFIG_PATH="/opt/X11/share/pkgconfig:/opt/X11/lib/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="/opt/X11/share/pkgconfig:/opt/X11/lib/pkgconfig:${PKG_CONFIG_PATH}"
export ACLOCAL="aclocal -I /opt/X11/share/aclocal -I /usr/local/share/aclocal" export ACLOCAL="aclocal -I /opt/X11/share/aclocal -I /usr/local/share/aclocal"
export CFLAGS="-Wall -O2 -ggdb3 -arch i386 -arch x86_64 -pipe" export CFLAGS="-Wall -O2 -ggdb3 -arch x86_64 -pipe"
export CXXFLAGS=$CFLAGS export CXXFLAGS=$CFLAGS
export OBJCFLAGS=$CFLAGS export OBJCFLAGS=$CFLAGS
export LDFLAGS=$CFLAGS export LDFLAGS=$CFLAGS