- merged 2013 from PLD

[packages/rpm-tld-macros.git] / macros.go

diff --git a/macros.go b/macros.go
index a310a5c983df967a4db2c4b1ca6e0ac9d92ce216..2cdd8f915fbd6a9927fbc3679b95a7168b0c731b 100644 (file)
--- a/macros.go
+++ b/macros.go
@@ -25,6 +25,11 @@
 %endif \
 %ifarch %{ix86} \
        GOARCH=${GOARCH-386} \\\
+%ifarch %{x86_with_sse2} \
+       GO386=${GO386-sse2} \\\
+%else \
+       GO386=${GO386-softfloat} \\\
+%endif \
 %endif \
 %ifarch %{x8664} \
        GOARCH=${GOARCH-amd64} \\\
@@ -32,7 +37,7 @@
 %ifarch mips mips64 ppc64 ppc64le riscv64 s390x \
        GOARCH=${GOARCH-%{_arch}} \\\
 %endif \
-       %{?go_cachedir:GOCACHE="%{go_cachedir}"} \\\
+       %{?go_cachedir:GOCACHE="${GOCACHE-%{go_cachedir}}"} \\\
        %{?__jobs:GOMAXPROCS=%{__jobs}} \\\
        GOOS=${GOOS-linux} \\\
        /usr/bin/go