@@ -419,8 +419,10 @@ for TARGET in $TARGETS; do
419419 if [ $XGOOS == " ." || [[ $XGOOS == windows* ]]; then
420420 # Split the platform version and configure the Windows NT version
421421 PLATFORM=$( echo $XGOOS | cut -d ' -' )
422+ PLATFORM_SUFFIX=" -$PLATFORM "
422423 if [ " $PLATFORM " == " " || [ " $PLATFORM " == " ." || [ " $PLATFORM " == " windows" ; then
423424 PLATFORM=$WINDOWS_DEFAULT_TARGET
425+ PLATFORM_SUFFIX=" "
424426 fi
425427
426428 MAJOR=$( echo $PLATFORM | cut -d ' .' )
@@ -431,50 +433,52 @@ for TARGET in $TARGETS; do
431433
432434 # Build the requested windows binaries
433435 if [ $XGOARCH == " ." || [ $XGOARCH == " amd64" ; then
434- echo " Compiling for windows- $PLATFORM /amd64..."
436+ echo " Compiling for windows$PLATFORM_SUFFIX /amd64..."
435437 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ HOST=x86_64-w64-mingw32 PREFIX=/usr/x86_64-w64-mingw32 xgo-build-deps /deps ${DEPS_ARGS[@]}
436438 export PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/lib/pkgconfig
437439
438440 if [[ " $USEMODULES " == false ]]; then
439441 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CGO_CFLAGS=" $CGO_NTDEF " " $CGO_NTDEF " $V $X $TP $VCS " ${T[@]} " " $V $LD " $PACK_RELPATH
440442 fi
441443 ext=$( extension windows)
442- (set -x ; CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CGO_CFLAGS=" $CGO_NTDEF " " $CGO_NTDEF " $V $X $TP $VCS $MOD " ${T[@]} " " $V $LD " $R $BM -o " /build/$NAME -windows-$PLATFORM - amd64$R$ext " $PACK_RELPATH )
444+ (set -x ; CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CGO_CFLAGS=" $CGO_NTDEF " " $CGO_NTDEF " $V $X $TP $VCS $MOD " ${T[@]} " " $V $LD " $R $BM -o " /build/$NAME -windows-amd64$R$ext " $PACK_RELPATH )
443445 fi
444446 if [ $XGOARCH == " ." || [ $XGOARCH == " 386" ; then
445- echo " Compiling for windows- $PLATFORM /386..."
447+ echo " Compiling for windows$PLATFORM_SUFFIX /386..."
446448 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ HOST=i686-w64-mingw32 PREFIX=/usr/i686-w64-mingw32 xgo-build-deps /deps ${DEPS_ARGS[@]}
447449 export PKG_CONFIG_PATH=/usr/i686-w64-mingw32/lib/pkgconfig
448450
449451 if [[ " $USEMODULES " == false ]]; then
450452 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ GOOS=windows GOARCH=386 CGO_ENABLED=1 CGO_CFLAGS=" $CGO_NTDEF " " $CGO_NTDEF " $V $X $TP $VCS " ${T[@]} " " $V $LD " $PACK_RELPATH
451453 fi
452454 ext=$( extension windows)
453- (set -x ; CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ GOOS=windows GOARCH=386 CGO_ENABLED=1 CGO_CFLAGS=" $CGO_NTDEF " " $CGO_NTDEF " $V $X $TP $VCS $MOD " ${T[@]} " " $V $LD " $BM -o " /build/$NAME -windows-$PLATFORM - 386$ext " $PACK_RELPATH )
455+ (set -x ; CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ GOOS=windows GOARCH=386 CGO_ENABLED=1 CGO_CFLAGS=" $CGO_NTDEF " " $CGO_NTDEF " $V $X $TP $VCS $MOD " ${T[@]} " " $V $LD " $BM -o " /build/$NAME -windows-386$ext " $PACK_RELPATH )
454456 fi
455457# FIXME: gcc_libinit_windows.c:8:10: fatal error: 'windows.h' file not found
456458# if [ $XGOARCH == "." ] || [ $XGOARCH == "arm64" ]; then
457459# if [ "$(semver compare "$GO_VERSION" "1.17.0")" -lt 0 ]; then
458- # echo "Go version too low, skipping windows-$PLATFORM /arm64..."
460+ # echo "Go version too low, skipping windows$PLATFORM_SUFFIX /arm64..."
459461# else
460- # echo "Compiling for windows-$PLATFORM /arm64..."
462+ # echo "Compiling for windows$PLATFORM_SUFFIX /arm64..."
461463# CC=aarch64-w64-mingw32-gcc CXX=aarch64-w64-mingw32-g++ HOST=aarch64-w64-mingw32 PREFIX=/usr/aarch64-w64-mingw32 xgo-build-deps /deps ${DEPS_ARGS[@]}
462464# export PKG_CONFIG_PATH=/usr/aarch64-w64-mingw32/lib/pkgconfig
463465#
464466# if [[ "$USEMODULES" == false ]]; then
465467# CC=aarch64-w64-mingw32-gcc CXX=aarch64-w64-mingw32-g++ GOOS=windows GOARCH=386 CGO_ENABLED=1 CGO_CFLAGS="$CGO_NTDEF" CGO_CXXFLAGS="$CGO_NTDEF" go get $V $X $TP $VCS "${T[@]}" --ldflags="$V $LD" -d $PACK_RELPATH
466468# fi
467469# ext=$(extension windows)
468- # (set -x ; CC=aarch64-w64-mingw32-gcc CXX=aarch64-w64-mingw32-gcc GOOS=windows GOARCH=386 CGO_ENABLED=1 CGO_CFLAGS="$CGO_NTDEF" CGO_CXXFLAGS="$CGO_NTDEF" go build $V $X $TP $VCS $MOD "${T[@]}" --ldflags="$V $LD" $BM -o "/build/$NAME-windows-$PLATFORM- 386$ext" $PACK_RELPATH)
470+ # (set -x ; CC=aarch64-w64-mingw32-gcc CXX=aarch64-w64-mingw32-gcc GOOS=windows GOARCH=386 CGO_ENABLED=1 CGO_CFLAGS="$CGO_NTDEF" CGO_CXXFLAGS="$CGO_NTDEF" go build $V $X $TP $VCS $MOD "${T[@]}" --ldflags="$V $LD" $BM -o "/build/$NAME-windows-386$ext" $PACK_RELPATH)
469471# fi
470472# fi
471473 fi
472474 # Check and build for OSX targets
473475 if [ $XGOOS == " ." || [[ $XGOOS == darwin* ]]; then
474476 # Split the platform version and configure the deployment target
475477 PLATFORM=$( echo $XGOOS | cut -d ' -' )
478+ PLATFORM_SUFFIX=" -$PLATFORM "
476479 if [ " $PLATFORM " == " " || [ " $PLATFORM " == " ." || [ " $PLATFORM " == " darwin" ; then
477480 PLATFORM=$DARWIN_DEFAULT_TARGET
481+ PLATFORM_SUFFIX=" "
478482 fi
479483 export MACOSX_DEPLOYMENT_TARGET=$PLATFORM
480484
@@ -485,38 +489,38 @@ for TARGET in $TARGETS; do
485489 fi
486490 # Build the requested darwin binaries
487491 if [ $XGOARCH == " ." || [ $XGOARCH == " amd64" ; then
488- echo " Compiling for darwin- $PLATFORM /amd64..."
492+ echo " Compiling for darwin$PLATFORM_SUFFIX /amd64..."
489493 CC=o64-clang CXX=o64-clang++ HOST=x86_64-apple-darwin15 PREFIX=/usr/local xgo-build-deps /deps ${DEPS_ARGS[@]}
490494 if [[ " $USEMODULES " == false ]]; then
491495 CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 go get $V $X $TP $VCS " ${T[@]} " " $LDSTRIP $V $LD " $PACK_RELPATH
492496 fi
493497 ext=$( extension darwin)
494- (set -x ; CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 go build $V $X $TP $VCS $MOD " ${T[@]} " " $LDSTRIP $V $LD " $R $BM -o " /build/$NAME -darwin-$PLATFORM - amd64$R$ext " $PACK_RELPATH )
498+ (set -x ; CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 go build $V $X $TP $VCS $MOD " ${T[@]} " " $LDSTRIP $V $LD " $R $BM -o " /build/$NAME -darwin-amd64$R$ext " $PACK_RELPATH )
495499 fi
496500 if [ $XGOARCH == " ." || [ $XGOARCH == " arm64" ; then
497501 if [ " $( semver compare " $GO_VERSION " " 1.16.0" ) " -lt 0 ]; then
498- echo " Go version too low, skipping darwin- $PLATFORM /arm64..."
502+ echo " Go version too low, skipping darwin/arm64..."
499503 else
500- echo " Compiling for darwin- $PLATFORM /arm64..."
504+ echo " Compiling for darwin$PLATFORM_SUFFIX /arm64..."
501505 CC=o64-clang CXX=o64-clang++ HOST=arm64-apple-darwin15 PREFIX=/usr/local xgo-build-deps /deps ${DEPS_ARGS[@]}
502506 if [[ " $USEMODULES " == false ]]; then
503507 CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go get $V $X $TP $VCS " ${T[@]} " " $LDSTRIP $V $LD " $PACK_RELPATH
504508 fi
505509 ext=$( extension darwin)
506- (set -x ; CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go build $V $X $TP $VCS $TP $MOD " ${T[@]} " " $LDSTRIP $V $LD " $R $BM -o " /build/$NAME -darwin-$PLATFORM - arm64$R$ext " $PACK_RELPATH )
510+ (set -x ; CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go build $V $X $TP $VCS $TP $MOD " ${T[@]} " " $LDSTRIP $V $LD " $R $BM -o " /build/$NAME -darwin-arm64$R$ext " $PACK_RELPATH )
507511 fi
508512 fi
509513 if [ $XGOARCH == " ." || [ $XGOARCH == " 386" ; then
510514 if [ " $( semver compare " $GO_VERSION " " 1.15.0" ) " -lt 0 ]; then
511- echo " Compiling for darwin- $PLATFORM /386..."
515+ echo " Compiling for darwin$PLATFORM_SUFFIX /386..."
512516 CC=o32-clang CXX=o32-clang++ HOST=i386-apple-darwin15 PREFIX=/usr/local xgo-build-deps /deps ${DEPS_ARGS[@]}
513517 if [[ " $USEMODULES " == false ]]; then
514518 CC=o32-clang CXX=o32-clang++ GOOS=darwin GOARCH=386 CGO_ENABLED=1 go get $V $X $TP $VCS " ${T[@]} " " $LDSTRIP $V $LD " $PACK_RELPATH
515519 fi
516520 ext=$( extension darwin)
517- (set -x ; CC=o32-clang CXX=o32-clang++ GOOS=darwin GOARCH=386 CGO_ENABLED=1 go build $V $X $TP $VCS $MOD " ${T[@]} " " $LDSTRIP $V $LD " $BM -o " /build/$NAME -darwin-$PLATFORM - 386$ext " $PACK_RELPATH )
521+ (set -x ; CC=o32-clang CXX=o32-clang++ GOOS=darwin GOARCH=386 CGO_ENABLED=1 go build $V $X $TP $VCS $MOD " ${T[@]} " " $LDSTRIP $V $LD " $BM -o " /build/$NAME -darwin-386$ext " $PACK_RELPATH )
518522 else
519- echo " Go version too high, skipping darwin- $PLATFORM /386..."
523+ echo " Go version too high, skipping darwin$PLATFORM_SUFFIX /386..."
520524 fi
521525 fi
522526 # Remove any automatically injected deployment target vars
0 commit comments