From 77f02b16a48af3a8f09c2d2a0a8a854307c218fb Mon Sep 17 00:00:00 2001 From: vadym Date: Sun, 12 Sep 2021 18:52:58 +0300 Subject: [PATCH] updated ldflags --- build | 4 ++-- contrib/msi/build-msi.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build b/build index b61955d6..db5b00f3 100755 --- a/build +++ b/build @@ -5,7 +5,7 @@ set -ef PKGSRC=${PKGSRC:-github.com/RiV-chain/RiV-mesh/src/version} PKGNAME=${PKGNAME:-$(sh contrib/semver/name.sh)} PKGVER=${PKGVER:-$(sh contrib/semver/version.sh --bare)} -if [ $LDFLAGS ]; then +if [ "$LDFLAGS" ]; then LDFLAGS="$LDFLAGS -X $PKGSRC.buildName=$PKGNAME -X $PKGSRC.buildVersion=$PKGVER" else LDFLAGS="-X $PKGSRC.buildName=$PKGNAME -X $PKGSRC.buildVersion=$PKGVER" @@ -48,7 +48,7 @@ elif [ $ANDROID ]; then else for CMD in ./cmd/mesh ./cmd/meshctl ./contrib/ui/mesh-ui ; do echo "Building: $CMD" - go build $ARGS -ldflags="$LDFLAGS" -gcflags="$GCFLAGS" $CMD + go build $ARGS -ldflags "$LDFLAGS" -gcflags "$GCFLAGS" $CMD if [ $UPX ]; then upx --brute $CMD diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh index 32b17835..e494a215 100755 --- a/contrib/msi/build-msi.sh +++ b/contrib/msi/build-msi.sh @@ -48,8 +48,8 @@ then fi # Build Mesh! -[ "${PKGARCH}" == "x64" ] && GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ ./build -[ "${PKGARCH}" == "x86" ] && GOOS=windows GOARCH=386 CGO_ENABLED=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ ./build +[ "${PKGARCH}" == "x64" ] && GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ LDFLAGS="-H windowsgui" ./build +[ "${PKGARCH}" == "x86" ] && GOOS=windows GOARCH=386 CGO_ENABLED=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ LDFLAGS="-H windowsgui" ./build [ "${PKGARCH}" == "arm" ] && GOOS=windows GOARCH=arm CGO_ENABLED=0 ./build #[ "${PKGARCH}" == "arm64" ] && GOOS=windows GOARCH=arm64 CGO_ENABLED=0 ./build