Skip to content
Permalink
Browse files

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>
  • Loading branch information
rkitover committed Sep 28, 2019
1 parent c1636d1 commit c93e017d3ac27b9f969928e0b4cfeb7630e49aa2
Showing with 7 additions and 1 deletion.
  1. +7 −1 tools/builder/core.sh
@@ -408,11 +408,11 @@ DIST_MAKE_ARGS="$DIST_MAKE_ARGS
shared-mime-info -j1
xvidcore -j1
fontconfig LIBS=\"-lintl -liconv\"
libgsm CC=\"\$CC \$CFLAGS\"
"

DIST_MAKE_INSTALL_ARGS="$DIST_MAKE_INSTALL_ARGS
openssl MANDIR=/share/man
libgsm CC=\"\$CC\"
"

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'
fi

if ! command -v brew >/dev/null; then
error 'Please install Mac Homebrew: ;https://brew.sh/'
fi

brew -v install perl
}

setup_tmp_dir() {

0 comments on commit c93e017

Please sign in to comment.
You can’t perform that action at this time.