Skip to content

Commit

Permalink
Only add -lsha_stubs for opam master
Browse files Browse the repository at this point in the history
Allows the release scripts on master to build opam 2.1 release tags.
  • Loading branch information
dra27 committed Jan 24, 2023
1 parent 60a2d12 commit 05c6ae7
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions release/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,19 @@ build/%.image: build/Dockerfile.%
docker build -t opam-build-$* -f $^ build
touch $@

SHA_LINK = $(if $(shell tar xOf "$(OUTDIR)/opam-full-$(VERSION).tar.gz" opam-full-$(VERSION)/src_ext/Makefile.sources | grep -F URL_sha),-lsha_stubs)

# Actually, this is for alpine 3.13, and varies
CLINKING_linux = \
-Wl,-Bstatic \
-lunix -lmccs_stubs -lmccs_glpk_stubs -lsha_stubs \
-lunix -lmccs_stubs -lmccs_glpk_stubs $(SHA_LINK) \
-lstdc++ \
-static-libgcc \
-static
# -Wl,-Bdynamic

CLINKING_macos = \
-lunix -lmccs_stubs -lmccs_glpk_stubs -lsha_stubs \
-lunix -lmccs_stubs -lmccs_glpk_stubs $(SHA_LINK) \
-lstdc++

CLINKING_openbsd = $(CLINKING_macos)
Expand Down

0 comments on commit 05c6ae7

Please sign in to comment.