Merge pull request #3269 from dunhamsteve/fix-macos-build

[ fix ] fix macos ci
This commit is contained in:
André Videla 2024-04-28 08:16:30 +09:00 committed by GitHub
commit 3489cc3fa4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 3 deletions

View File

@ -158,7 +158,7 @@ test: testenv
@echo "NOTE: \`${MAKE} test\` does not rebuild Idris or the libraries packaged with it; to do that run \`${MAKE}\`"
@if [ ! -x "${TARGET}" ]; then echo "ERROR: Missing IDRIS2 executable. Cannot run tests!\n"; exit 1; fi
@echo
@${MAKE} -C tests only=$(only) except=$(except) IDRIS2=${TARGET} IDRIS2_PREFIX=${TEST_PREFIX}
@${MAKE} -C tests only=$(only) except=$(except) IDRIS2=${TARGET} IDRIS2_PREFIX=${TEST_PREFIX} CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
retest: testenv

View File

@ -36,6 +36,12 @@ else
SHLIB_SUFFIX := .so
endif
# Find homebrew's libgmp on ARM macs
ifneq (,$(wildcard ${HOMEBREW_PREFIX}/include/gmp.h))
CPPFLAGS += -I${HOMEBREW_PREFIX}/include
LDFLAGS += -L${HOMEBREW_PREFIX}/lib
endif
ifneq (, $(findstring freebsd, $(MACHINE)))
CFLAGS += -I$(shell /sbin/sysctl -n user.localbase)/include
LDFLAGS += -L$(shell /sbin/sysctl -n user.localbase)/lib

View File

@ -20,8 +20,8 @@ cd ./library/
make > /dev/null
cd ..
export CFLAGS="-I./library/ -O3"
export LDFLAGS="-L./library/ -Wl,-S"
export CFLAGS="-I./library/ -O3 ${CFLAGS}"
export LDFLAGS="-L./library/ -Wl,-S ${LDFLAGS}"
export LDLIBS="-lexternalc"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:./library/"
export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:./library/"