diff --git a/Makefile b/Makefile
index 0443b9b69a43919c028c615b9ef25b865496c073..495ea9fcedf9823bef4b34a3100be4698a9b088c 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 2262d095579c5f0d2b22ee8c7479711ee6fb97d2..17f76d4122c0118199fe918fc96c32e57d2efe16 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