Skip to content

Commit

Permalink
ci: try removing pkgconfig stuff and only do static on linux
Browse files Browse the repository at this point in the history
  • Loading branch information
stevana committed Nov 3, 2024
1 parent 5c5c64e commit 9834a15
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
12 changes: 4 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@ NEW_VERSION = "$(shell awk -F '=' '/^new-version/ \
$(GITHUB_OUTPUT))"
endif

# The find command on MacOS doesn't have a -executable flag.
ifeq ($(OS),darwin)
FIND_EXECUTABLE := -perm +0111
else
FIND_EXECUTABLE := -executable
endif

ifeq ($(OS),linux)
CABAL := docker run --rm --entrypoint=cabal \
--volume $(PWD):/mnt \
Expand All @@ -37,8 +30,11 @@ ifeq ($(OS),linux)
--volume $(PWD)/.container-cache/dist-newstyle:/mnt/dist-newstyle \
--env SPEX_GIT_COMMIT=$(SPEX_GIT_COMMIT) \
ghcr.io/spex-lang/spex-build:latest
ENABLE_STATIC := --enable-executable-static

else
CABAL := cabal
ENABLE_STATIC := ""
endif

all: build-deps build test bump install release
Expand All @@ -48,7 +44,7 @@ dist-newstyle/cache/plan.json: cabal.project cabal.project.freeze spex.cabal
mkdir -p .container-cache/cabal-packages
mkdir -p .container-cache/dist-newstyle
$(CABAL) configure \
--enable-executable-static \
$(ENABLE_STATIC) \
--disable-profiling \
--disable-library-for-ghci \
--enable-library-stripping \
Expand Down
4 changes: 2 additions & 2 deletions spex.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ library
, transformers
, unix

pkgconfig-depends: zlib
extra-libraries: z
-- pkgconfig-depends: zlib
-- extra-libraries: z
hs-source-dirs: src
default-language: GHC2021

Expand Down

0 comments on commit 9834a15

Please sign in to comment.