From f41a6c531f35a8e3bd3f02ea74f1d7dfd93f4e8b Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Fri, 23 Oct 2020 18:36:00 +0200
Subject: [PATCH] [pkg] remove ldflags
---
Makefile | 2 +-
gui/build.sh | 18 ++++++++++--------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 0443b9b6..495ea9fc 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ PKGFILES = $(shell find pkg -type f -name '*.go')
endif
lib/%.a: $(PKGFILES)
- @./gui/build.sh --just-golib
+ @XBUILD=no ./gui/build.sh --just-golib
relink_vendor:
ifeq ($(VENDOR_PATH), providers)
diff --git a/gui/build.sh b/gui/build.sh
index 2262d095..17f76d41 100755
--- a/gui/build.sh
+++ b/gui/build.sh
@@ -53,18 +53,20 @@ function buildGoLib {
if [ "$PLATFORM" == "Darwin" ]
then
GOOS=darwin
- CC=clang
- CGO_CFLAGS="-g -O2 -mmacosx-version-min=$OSX_TARGET"
- CGO_LDFLAGS="-g -O2 -mmacosx-version-min=$OSX_TARGET"
- fi
- if [ "$PLATFORM" == "MINGW64_NT-10.0" ]
- then
- LDFLAGS="-H windowsgui"
+ CC=clang
+ CGO_CFLAGS="-g -O2 -mmacosx-version-min=$OSX_TARGET"
+ CGO_LDFLAGS="-g -O2 -mmacosx-version-min=$OSX_TARGET"
fi
+
+ #if [ "$PLATFORM" == "MINGW64_NT-10.0" ]
+ #then
+ # LDFLAGS="-H windowsgui"
+ #fi
+
if [ "$XBUILD" == "no" ]
then
echo "[+] Building Go library with standard Go compiler"
- CGO_ENABLED=1 GOOS=$GOOS CC=$CC CGO_CFLAGS=$CGO_CFLAGS CGO_LDFLAGS=$CGO_LDFLAGS go build -ldflags $LDFLAGS -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB
+ CGO_ENABLED=1 GOOS=$GOOS CC=$CC CGO_CFLAGS=$CGO_CFLAGS CGO_LDFLAGS=$CGO_LDFLAGS go build -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB
fi
if [ "$XBUILD" == "$WIN64" ]
then
--
GitLab