Commit Diff

Commit:
512073980d39824ebc694507be294838a4dcc904
From:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
portable: MacOS: export env from configure Compiling -portable on MacOS directly would never have worked, as the environment was only being set when run under CI. Move these checks into configure.ac so that they propagate out to make, etc. Noticed by cjones on IRC.
Actions:
Patch | Tree
commit - 6ddaab3f7ace0aa9244989ee27cda0c074f7f99a
commit + 512073980d39824ebc694507be294838a4dcc904
blob - 178dd8ad8004de8363dd292f6a28d820a253e0ff
blob + 2c026400fa305c2d7a53ed4fd25940514b9762f7
--- .github/ci/build.sh
+++ .github/ci/build.sh
@@ -1,13 +1,5 @@
 #!/bin/sh
 
-[ "$CIRRUS_OS" = "darwin" ] && {
-	export PATH="/usr/local/opt/bison/bin:$PATH"
-	export LDFLAGS="-L/usr/local/opt/ncurses/lib -L/usr/local/opt/openssl@3/lib"
-	export CPPFLAGS="-I/usr/local/opt/ncurses/include -I/usr/local/opt/openssl@3/include"
-	export PKG_CONFIG_PATH="/usr/local/opt/ncurses/lib/pkgconfig"
-	export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@3/lib/pkgconfig"
-}
-
 ./autogen.sh || exit 1
 ./configure || exit 1
 exec make
blob - 03f15740f3c097653dbbe302ddc34e54e5c29483
blob + 70dcea359a5996c0b6db31f00846dcf9df935695
--- configure.ac
+++ configure.ac
@@ -196,6 +196,19 @@ AM_CONDITIONAL([HOST_DARWIN], [test "$PLATFORM" = "dar
 AM_CONDITIONAL([HOST_NETBSD], [test "$PLATFORM" = "netbsd"])
 AM_CONDITIONAL([HOST_DRAGONFLYBSD], [test "$PLATFORM" = "dragonflybsd"])
 
+if test x"$PLATFORM" = "xdarwin"; then
+	if ! test -x "/usr/local/opt/bison/bin/bison"; then
+		AC_MSG_ERROR("GNU Bison not found")
+	fi
+
+	# Override YACC here to point to the GNU version of bison.
+	export YACC="/usr/local/opt/bison/bin/bison -y"
+	export LDFLAGS="-L/usr/local/opt/ncurses/lib -L/usr/local/opt/openssl@3/lib $LDFLAGS"
+	export CPPFLAGS="-I/usr/local/opt/ncurses/include -I/usr/local/opt/openssl@3/include $CPPFLAGS"
+	export PKG_CONFIG_PATH="/usr/local/opt/ncurses/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@3/lib/pkgconfig"
+fi
+
 # Landlock detection.
 AC_MSG_CHECKING([for landlock])
 AM_CONDITIONAL([HAVE_LINUX_LANDLOCK],