Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ compiler/package.yaml
compiler/acton/acton.cabal
compiler/acton/package.yaml
compiler/lib/package.yaml
compiler/lib/libacton.cabal
compiler/lsp-server/package.yaml
compiler/lsp-server/lsp-server-acton.cabal
test/package.yaml
Expand Down
6 changes: 4 additions & 2 deletions compiler/acton/package.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,10 @@ executables:
- -optl-no-pie
- -pgml=../tools/ld-wrapper.sh
- condition: os(linux) && !arch(aarch64)
ld-options:
- -static
ghc-options:
- -no-pie
- -optl-no-pie
- -pgml=../tools/ld-wrapper.sh

tests:
test_acton:
Expand Down
6 changes: 4 additions & 2 deletions compiler/lsp-server/package.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,7 @@ executables:
- -optl-no-pie
- -pgml=../tools/ld-wrapper.sh
- condition: os(linux) && !arch(aarch64)
ld-options:
- -static
ghc-options:
- -no-pie
- -optl-no-pie
- -pgml=../tools/ld-wrapper.sh
2 changes: 1 addition & 1 deletion compiler/tools/ld-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ state="static"
arch="$(uname -m 2>/dev/null || true)"
allow_dynamic_glibc=false
case "$arch" in
aarch64|arm64)
aarch64|arm64|x86_64|amd64)
allow_dynamic_glibc=true
;;
esac
Expand Down
Loading