diff --git a/.gitignore b/.gitignore index 2ee8c05ee..69f413a2f 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/compiler/acton/package.yaml.in b/compiler/acton/package.yaml.in index d509b21c9..ce6ef90cd 100644 --- a/compiler/acton/package.yaml.in +++ b/compiler/acton/package.yaml.in @@ -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: diff --git a/compiler/lsp-server/package.yaml.in b/compiler/lsp-server/package.yaml.in index 854a836b3..5513f1ae2 100644 --- a/compiler/lsp-server/package.yaml.in +++ b/compiler/lsp-server/package.yaml.in @@ -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 diff --git a/compiler/tools/ld-wrapper.sh b/compiler/tools/ld-wrapper.sh index 2d554ff16..95dd40246 100755 --- a/compiler/tools/ld-wrapper.sh +++ b/compiler/tools/ld-wrapper.sh @@ -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