Skip to content

Commit

Permalink
Fix linking-flags for static linking
Browse files Browse the repository at this point in the history
  • Loading branch information
lefessan committed Sep 29, 2023
1 parent 8215ad4 commit 15c4a1f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
9 changes: 2 additions & 7 deletions .drom
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version:0.9.0

# hash of toml configuration files
# used for generation of all files
b602227bcc8caec31bc7877658492520:.
0b8b0a34a1a2cc1f1b27ccb09438599a:.
# end context for .

# begin context for .github/workflows/workflow.yml
Expand Down Expand Up @@ -218,11 +218,6 @@ fa0d293d04760149271fed31ae820474:opam/vscode-js-stubs.opam
f951d9038416ddabc15e92ae09d8d54c:opam/vscode-languageclient-js-stubs.opam
# end context for opam/vscode-languageclient-js-stubs.opam

# begin context for opam/vscode-package-json.opam
# file opam/vscode-package-json.opam
d409e0c4b5466dcd38315b2ee8fba4a8:opam/vscode-package-json.opam
# end context for opam/vscode-package-json.opam

# begin context for scripts/after.sh
# file scripts/after.sh
62c6489217feef26dac343e709b89c1a:scripts/after.sh
Expand Down Expand Up @@ -400,7 +395,7 @@ bb6994bfe27f29a441abee11c82b032f:src/lsp/cobol_typeck/dune

# begin context for src/lsp/superbol-free/linking_flags.sh
# file src/lsp/superbol-free/linking_flags.sh
b9a14c96cce8e365e1d7494d078d73fe:src/lsp/superbol-free/linking_flags.sh
4481ce2bc21d3553716a7914d2cc015a:src/lsp/superbol-free/linking_flags.sh
# end context for src/lsp/superbol-free/linking_flags.sh

# begin context for src/lsp/superbol_free_lib/dune
Expand Down
4 changes: 2 additions & 2 deletions src/lsp/superbol-free/linking_flags.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ case "$1" in
linux)
case $(. /etc/os-release && echo $ID) in
alpine)
COMMON_LIBS=" camlstr unix c"
COMMON_LIBS="bigstringaf_stubs cstruct_stubs camlstr unix c"
# `m` and `pthread` are built-in musl
echo2 '(-noautolink'
echo2 ' -cclib -Wl,-Bstatic'
Expand All @@ -63,7 +63,7 @@ case "$1" in
esac
;;
macosx)
COMMON_LIBS="camlstr unix"
COMMON_LIBS="camlstr bigstringaf_stubs cstruct_stubs unix"
# `m` and `pthread` are built-in in libSystem
echo2 '(-noautolink'
for l in $COMMON_LIBS; do
Expand Down
3 changes: 2 additions & 1 deletion src/lsp/superbol-free/package.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,5 @@ superbol_free_lib = "version"
dune-flags = "(:standard (:include linking.sexp))"
# static-alpine-clibs = "zarith gmp"
# static-macos-clibs = "zarith ${MACPORTS:-/usr/local/osxcross/macports/pkgs/opt/local}/lib/libgmp.a camlstr"
static-macos-clibs = "camlstr"
static-macos-clibs = "camlstr bigstringaf_stubs cstruct_stubs"
static-alpine-clibs = "bigstringaf_stubs cstruct_stubs"

0 comments on commit 15c4a1f

Please sign in to comment.