Don't force link gettext on macOS for travis-ci

CleverRaven · Apr 14, 2020 · 89548bc · 89548bc
1 parent 0f42068
commit 89548bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
@@ -15,6 +15,13 @@ function run_tests
 # We might need binaries installed via pip, so ensure that our personal bin dir is on the PATH
 export PATH=$HOME/.local/bin:$PATH
 
+# If building on macOS we need to set these so our builds can find the Homebrew version of gettext.
+if [ "$TRAVIS_OS_NAME" == "osx" ]
+then
+    set -gx LDFLAGS "-L/usr/local/opt/gettext/lib"
+    set -gx CPPFLAGS "-I/usr/local/opt/gettext/include"
+fi
+
 if [ -n "$TEST_STAGE" ]
 then
     build-scripts/lint-json.sh

diff --git a/build-scripts/requirements.sh b/build-scripts/requirements.sh
@@ -74,7 +74,6 @@ fi
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   brew update
   brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ncurses ccache
-  brew link --force gettext ncurses
 fi
 
 if [[ "$NATIVE" == "android" ]]; then