fix variables name

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 43ad891ad90c2ba740724e1d9952b2c7d0d62c11..849267d4e3094f00d75eccbace1fb443ff0cd5e8 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,7 +86,7 @@ jobs:
       - name: All in one
         run: |
           cd exes/all
-          export LDFLAGS='-lntdll -lWs2_32 -lcrypt32 -lSecur32 -luserenv -lNcrypt -lbcrypt'
+          export CGO_LDFLAGS='-lntdll -lWs2_32 -lcrypt32 -lSecur32 -luserenv -lNcrypt -lbcrypt'
           mingw32-make.exe build
       
       - name: Move artifacts

diff --git a/exes/all/Makefile b/exes/all/Makefile
index 906a08206ffceb1824d7126fede5923ac523dba2..22a67e0b9c1f04c60672e189ccbeaf35c5cff5c5 100644 (file)
--- a/exes/all/Makefile
+++ b/exes/all/Makefile
@@ -6,7 +6,7 @@ library:
 
 build: library
        cp ../../target/release/liball.a ./build
-       go build -a -ldflags '-s $(LDFLAGS)' -o build/all
+       go build -a -ldflags '-s' -o build/all
 
 all: library build
 

diff --git a/exes/all/main.go b/exes/all/main.go
index 6e1f7c0f1f777ab432fba6852d8042d9f71478e3..3a8a9d8665dea2054e16c7af939a8a833c4c95f5 100644 (file)
--- a/exes/all/main.go
+++ b/exes/all/main.go
@@ -1,7 +1,7 @@
 package main
 
 /*
-#cgo LDFLAGS: -L./build -lall -lcrypto -lz -ldl -lssl -lm -static-libgcc
+#cgo LDFLAGS: -L./build -lall -lcrypto -lz -ldl -lssl -lm
 #include "./build/all.h"
 */
 import "C"