From fd00fd0a27de42593704ce2845803e21618ac607 Mon Sep 17 00:00:00 2001 From: Konstantin Dmitriev Date: Jan 11 2019 09:43:31 +0000 Subject: OSX build: Allow gettext to be detected at compile-time --- diff --git a/autobuild/build.sh b/autobuild/build.sh index 23f88e8..f012d92 100755 --- a/autobuild/build.sh +++ b/autobuild/build.sh @@ -77,11 +77,13 @@ if [[ `uname` == "Darwin" ]]; then # autopoint is not in PATH after install via brew (conflicting with system gettext https://github.com/Homebrew/legacy-homebrew/issues/24070) # so we can do `brew link --force gettext` or just add it to PATH before configuring which is preferable because we need it only for compiling export PATH="/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:${PATH}" + export LDFLAGS="-L/usr/local/opt/gettext/lib ${LDFLAGS}" + export CPPFLAGS="-I/usr/local/opt/gettext/include ${CPPFLAGS}" fi export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH} export PATH=${PREFIX}/bin:$PATH export LD_LIBRARY_PATH=${PREFIX}/lib:${PREFIX}/lib64:/usr/local/lib:$LD_LIBRARY_PATH -export LDFLAGS="-Wl,-rpath -Wl,\\\$\$ORIGIN/lib" +export LDFLAGS="-Wl,-rpath -Wl,\\\$\$ORIGIN/lib ${LDFLAGS}" export CFLAGS="-fdiagnostics-color=always $CFLAGS" export CXXFLAGS="-fdiagnostics-color=always $CXXFLAGS"