ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

builder: minor changes to support mac 32 bit 

Pass `CC="$CC $CFLAGS"` to `make` for `libgsm`, so that the `-m32` is
passed for 32 bit builds.

For `mac_install_core_deps()` make sure brew is installed and install
brew perl, otherwise perl extensions cannot be built on Mojave for 32
bit.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2019-09-28 14:29:40 -07:00
parent c1636d1bcf
commit c93e017d3a
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/builder/core.sh
View File

@ -408,11 +408,11 @@ DIST_MAKE_ARGS="$DIST_MAKE_ARGS
shared-mime-info -j1 shared-mime-info -j1
xvidcore -j1 xvidcore -j1
fontconfig LIBS=\"-lintl -liconv\" fontconfig LIBS=\"-lintl -liconv\"
libgsm CC=\"\$CC \$CFLAGS\"
" "
DIST_MAKE_INSTALL_ARGS="$DIST_MAKE_INSTALL_ARGS DIST_MAKE_INSTALL_ARGS="$DIST_MAKE_INSTALL_ARGS
openssl MANDIR=/share/man openssl MANDIR=/share/man
libgsm CC=\"\$CC\"
" "
DIST_EXTRA_LDFLAGS="$DIST_EXTRA_LDFLAGS DIST_EXTRA_LDFLAGS="$DIST_EXTRA_LDFLAGS
@ -745,6 +745,12 @@ mac_install_core_deps() {
error 'Please install XCode and the XCode Command Line Tools, then run this script again. On newer systems this can be done with: ;xcode-select --install' error 'Please install XCode and the XCode Command Line Tools, then run this script again. On newer systems this can be done with: ;xcode-select --install'
fi fi
if ! command -v brew >/dev/null; then
error 'Please install Mac Homebrew: ;https://brew.sh/'
fi
brew -v install perl
} }
setup_tmp_dir() { setup_tmp_dir() {