Skip to content

Commit

Permalink
Change linker with DFLAGS instead
Browse files Browse the repository at this point in the history
  • Loading branch information
looked-at-me committed May 8, 2020
1 parent 1c26588 commit 30576a9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV RDMD_BRANCH "v2.091.0"

RUN apk add --no-cache llvm5-libs g++ binutils-gold clang \
llvm8-libs llvm8-static llvm8-dev \
cmake ninja zlib-dev curl-dev curl-static openssl-dev git make
cmake ninja zlib-dev curl-dev curl-static openssl openssl-dev git make

# build ldc2 ########################################################

Expand Down
2 changes: 1 addition & 1 deletion ci/docker.build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
set -e -u

cd /core/
dub build -c static --compiler=ldc2
DFLAGS="-linker=bfd" dub build -c static --compiler=ldc2
4 changes: 1 addition & 3 deletions dub.sdl
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ configuration "static" {
targetType "executable"
versions "VibeDefaultMain"
lflags "-lz" "-lssl" "-lcrypto" "-ldl" platform="posix"

// gcc on alpine has issues with the ld.gold linker, use bfd instead
dflags "-linker=bfd" "-static" platform="posix"
dflags "-static" platform="posix"
}
configuration "library" {
versions "VibeCustomMain"
Expand Down

0 comments on commit 30576a9

Please sign in to comment.