remove external linker in linux builds

cloudflare · Nov 22, 2022 · 540aeaf · 540aeaf
1 parent c383f2a
commit 540aeaf
Showing 1 changed file with 1 addition and 26 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -28,9 +28,6 @@ builds:
     main: ./cmd/cfssl
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: cfssl-windows
     binary: cfssl
     env:
@@ -63,13 +60,8 @@ builds:
     goarch:
       - amd64
     main: ./cmd/cfssl-bundle
-    flags:
-      - -trimpath
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: cfssl-bundle-windows
     binary: cfssl-bundle
     env:
@@ -104,9 +96,6 @@ builds:
     main: ./cmd/cfssl-certinfo
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: cfssl-certinfo-windows
     binary: cfssl-certinfo
     env:
@@ -141,9 +130,6 @@ builds:
     main: ./cmd/cfssl-newkey
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: cfssl-newkey-windows
     binary: cfssl-newkey
     env:
@@ -178,9 +164,6 @@ builds:
     main: ./cmd/cfssl-scan
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: cfssl-scan-windows
     binary: cfssl-scan
     env:
@@ -215,9 +198,6 @@ builds:
     main: ./cmd/cfssljson
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: cfssljson-windows
     binary: cfssljson
     env:
@@ -235,6 +215,7 @@ builds:
     env:
       - CC=o64-clang
       - CXX=o64-clang++
+      - CGO_ENABLED=1
     goos:
       - darwin
     goarch:
@@ -251,9 +232,6 @@ builds:
     main: ./cmd/mkbundle
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: mkbundle-windows
     binary: mkbundle
     env:
@@ -288,9 +266,6 @@ builds:
     main: ./cmd/multirootca
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: multirootca-windows
     binary: multirootca
     env: