Skip to content

Commit 83f8343

Browse files
techknowlogicktechknowlogick
authored
fix arm64 bit builds
1 parent ff1a00e commit 83f8343

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎docker/build/build.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,13 @@ for TARGET in $TARGETS; do
258258
ln -s /usr/local/go/pkg/linux_arm-5 /usr/local/go/pkg/linux_arm
259259
fi
260260
echo "Compiling for linux/arm-5..."
261-
XGOOS="linux" XGOARCH="arm-5" GOCACHE=/gocache/linux/arm-5 CC=arm-linux-gnueabi-gcc CXX=aarch64-linux-gnu-g++ HOST=arm-linux-gnueabi-gcc PREFIX=/usr/aarch64-linux-gnu CFLAGS="-march=armv5t" CXXFLAGS="-march=armv5t" do_build
262-
export PKG_CONFIG_PATH=/usr/aarch64-linux-gnu/lib/pkgconfig
261+
XGOOS="linux" XGOARCH="arm-5" GOCACHE=/gocache/linux/arm-5 CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnu-g++ HOST=arm-linux-gnueabi-gcc PREFIX=/usr/arm-linux-gnu CFLAGS="-march=armv5t" CXXFLAGS="-march=armv5t" do_build
262+
export PKG_CONFIG_PATH=/usr/arm-linux-gnu/lib/pkgconfig
263263

264264
if [[ "$USEMODULES" == false ]]; then
265-
GOCACHE=/gocache/linux/arm-5 CC=arm-linux-gnueabi-gcc CXX=aarch64-linux-gnu-g++ GOOS=linux GOARCH=arm GOARM=5 CGO_ENABLED=1 CGO_CFLAGS="-march=armv5t" CGO_CXXFLAGS="-march=armv5t" go get $V $X "${T[@]}" -d "$PACK_RELPATH"
265+
GOCACHE=/gocache/linux/arm-5 CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnu-g++ GOOS=linux GOARCH=arm GOARM=5 CGO_ENABLED=1 CGO_CFLAGS="-march=armv5t" CGO_CXXFLAGS="-march=armv5t" go get $V $X "${T[@]}" -d "$PACK_RELPATH"
266266
fi
267-
GOCACHE=/gocache/linux/arm-5 CC=arm-linux-gnueabi-gcc CXX=aarch64-linux-gnu-g++ GOOS=linux GOARCH=arm GOARM=5 CGO_ENABLED=1 CGO_CFLAGS="-march=armv5t" CGO_CXXFLAGS="-march=armv5t" $GOBIN build $V $X $TP $BV "${MOD[@]}" "${T[@]}" "${LDF[@]}" "${GC[@]}" "${BM[@]}" -o "/build/$NAME-linux-arm-5$(extension linux)" "$PACK_RELPATH"
267+
GOCACHE=/gocache/linux/arm-5 CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnu-g++ GOOS=linux GOARCH=arm GOARM=5 CGO_ENABLED=1 CGO_CFLAGS="-march=armv5t" CGO_CXXFLAGS="-march=armv5t" $GOBIN build $V $X $TP $BV "${MOD[@]}" "${T[@]}" "${LDF[@]}" "${GC[@]}" "${BM[@]}" -o "/build/$NAME-linux-arm-5$(extension linux)" "$PACK_RELPATH"
268268
if [ "$GO_VERSION_MAJOR" -gt 1 ] || { [ "$GO_VERSION_MAJOR" == 1 ] && [ "$GO_VERSION_MINOR" -ge 15 ]; }; then
269269
rm /usr/local/go/pkg/linux_arm
270270
fi
@@ -274,13 +274,13 @@ for TARGET in $TARGETS; do
274274
ln -s /usr/local/go/pkg/linux_arm-6 /usr/local/go/pkg/linux_arm
275275

276276
echo "Compiling for linux/arm-6..."
277-
XGOOS="linux" XGOARCH="arm-6" GOCACHE=/gocache/linux/arm-6 CC=arm-linux-gnueabi-gcc CXX=aarch64-linux-gnu-g++ HOST=arm-linux-gnueabi-gcc PREFIX=/usr/aarch64-linux-gnu CFLAGS="-march=armv6" CXXFLAGS="-march=armv6" do_build
278-
export PKG_CONFIG_PATH=/usr/aarch64-linux-gnu/lib/pkgconfig
277+
XGOOS="linux" XGOARCH="arm-6" GOCACHE=/gocache/linux/arm-6 CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnu-g++ HOST=arm-linux-gnueabi-gcc PREFIX=/usr/arm-linux-gnu CFLAGS="-march=armv6" CXXFLAGS="-march=armv6" do_build
278+
export PKG_CONFIG_PATH=/usr/arm-linux-gnu/lib/pkgconfig
279279

280280
if [[ "$USEMODULES" == false ]]; then
281-
GOCACHE=/gocache/linux/arm-6 CC=arm-linux-gnueabi-gcc CXX=aarch64-linux-gnu-g++ GOOS=linux GOARCH=arm GOARM=6 CGO_ENABLED=1 CGO_CFLAGS="-march=armv6" CGO_CXXFLAGS="-march=armv6" go get $V $X "${T[@]}" -d "$PACK_RELPATH"
281+
GOCACHE=/gocache/linux/arm-6 CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnu-g++ GOOS=linux GOARCH=arm GOARM=6 CGO_ENABLED=1 CGO_CFLAGS="-march=armv6" CGO_CXXFLAGS="-march=armv6" go get $V $X "${T[@]}" -d "$PACK_RELPATH"
282282
fi
283-
GOCACHE=/gocache/linux/arm-6 CC=arm-linux-gnueabi-gcc CXX=aarch64-linux-gnu-g++ GOOS=linux GOARCH=arm GOARM=6 CGO_ENABLED=1 CGO_CFLAGS="-march=armv6" CGO_CXXFLAGS="-march=armv6" $GOBIN build $V $X $TP $BV "${MOD[@]}" "${T[@]}" "${LDF[@]}" "${GC[@]}" "${BM[@]}" -o "/build/$NAME-linux-arm-6$(extension linux)" "$PACK_RELPATH"
283+
GOCACHE=/gocache/linux/arm-6 CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnu-g++ GOOS=linux GOARCH=arm GOARM=6 CGO_ENABLED=1 CGO_CFLAGS="-march=armv6" CGO_CXXFLAGS="-march=armv6" $GOBIN build $V $X $TP $BV "${MOD[@]}" "${T[@]}" "${LDF[@]}" "${GC[@]}" "${BM[@]}" -o "/build/$NAME-linux-arm-6$(extension linux)" "$PACK_RELPATH"
284284

285285
rm /usr/local/go/pkg/linux_arm
286286
fi
@@ -289,26 +289,26 @@ for TARGET in $TARGETS; do
289289
ln -s /usr/local/go/pkg/linux_arm-7 /usr/local/go/pkg/linux_arm
290290

291291
echo "Compiling for linux/arm-7..."
292-
XGOOS="linux" XGOARCH="arm-7" GOCACHE=/gocache/linux/arm-7 CC=arm-linux-gnueabi-gcc CXX=aarch64-linux-gnu-g++ HOST=arm-linux-gnueabi-gcc PREFIX=/usr/aarch64-linux-gnu CFLAGS="-march=armv7-a -fPIC" CXXFLAGS="-march=armv7-a -fPIC" do_build
293-
export PKG_CONFIG_PATH=/usr/aarch64-linux-gnu/lib/pkgconfig
292+
XGOOS="linux" XGOARCH="arm-7" GOCACHE=/gocache/linux/arm-7 CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnu-g++ HOST=arm-linux-gnueabi-gcc PREFIX=/usr/arm-linux-gnu CFLAGS="-march=armv7-a -fPIC" CXXFLAGS="-march=armv7-a -fPIC" do_build
293+
export PKG_CONFIG_PATH=/usr/arm-linux-gnu/lib/pkgconfig
294294

295295
if [[ "$USEMODULES" == false ]]; then
296-
GOCACHE=/gocache/linux/arm-7 CC=arm-linux-gnueabi-gcc CXX=aarch64-linux-gnu-g++ GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CGO_CFLAGS="-march=armv7-a -fPIC" CGO_CXXFLAGS="-march=armv7-a -fPIC" go get $V $X "${T[@]}" -d "$PACK_RELPATH"
296+
GOCACHE=/gocache/linux/arm-7 CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnu-g++ GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CGO_CFLAGS="-march=armv7-a -fPIC" CGO_CXXFLAGS="-march=armv7-a -fPIC" go get $V $X "${T[@]}" -d "$PACK_RELPATH"
297297
fi
298-
GOCACHE=/gocache/linux/arm-7 CC=arm-linux-gnueabi-gcc CXX=aarch64-linux-gnu-g++ GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CGO_CFLAGS="-march=armv7-a -fPIC" CGO_CXXFLAGS="-march=armv7-a -fPIC" $GOBIN build $V $X $TP $BV "${MOD[@]}" "${T[@]}" "${LDF[@]}" "${GC[@]}" "${BM[@]}" -o "/build/$NAME-linux-arm-7$(extension linux)" "$PACK_RELPATH"
298+
GOCACHE=/gocache/linux/arm-7 CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnu-g++ GOOS=linux GOARCH=arm GOARM=7 CGO_ENABLED=1 CGO_CFLAGS="-march=armv7-a -fPIC" CGO_CXXFLAGS="-march=armv7-a -fPIC" $GOBIN build $V $X $TP $BV "${MOD[@]}" "${T[@]}" "${LDF[@]}" "${GC[@]}" "${BM[@]}" -o "/build/$NAME-linux-arm-7$(extension linux)" "$PACK_RELPATH"
299299

300300
rm /usr/local/go/pkg/linux_arm
301301
fi
302302
if { [ "$XGOOS" == "." ] || [ "$XGOOS" == "linux" ]; } && { [ "$XGOARCH" == "." ] || [ "$XGOARCH" == "arm64" ]; }; then
303303
echo "Compiling for linux/arm64..."
304304
mkdir -p /gocache/linux/arm64
305-
XGOOS="linux" XGOARCH="arm64" GOCACHE=/gocache/linux/arm64 CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnueabihf-g++ PREFIX=/usr/arm-linux-gnueabi-gcc/ do_build
306-
export PKG_CONFIG_PATH=/usr/arm-linux-gnueabi-gcc/lib/pkgconfig
305+
XGOOS="linux" XGOARCH="arm64" GOCACHE=/gocache/linux/arm64 CC=aarch64-linux-gnueabi-gcc CXX=aarch64-linux-gnueabihf-g++ PREFIX=/usr/aarch64-linux-gnueabi-gcc/ do_build
306+
export PKG_CONFIG_PATH=/usr/aarch64-linux-gnueabi-gcc/lib/pkgconfig
307307

308308
if [[ "$USEMODULES" == false ]]; then
309-
GOCACHE=/gocache/linux/arm64 CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnueabihf-g++ GOOS=linux GOARCH=arm CGO_ENABLED=1 go get $V $X "${T[@]}" -d "$PACK_RELPATH"
309+
GOCACHE=/gocache/linux/arm64 CC=aarch64-linux-gnueabi-gcc CXX=aarch64-linux-gnueabihf-g++ GOOS=linux GOARCH=arm64 CGO_ENABLED=1 go get $V $X "${T[@]}" -d "$PACK_RELPATH"
310310
fi
311-
GOCACHE=/gocache/linux/arm64 CC=arm-linux-gnueabi-gcc CXX=arm-linux-gnueabihf-g++ GOOS=linux GOARCH=arm CGO_ENABLED=1 $GOBIN build $V $X $TP $BV "${MOD[@]}" "${T[@]}" "${LDF[@]}" "${GC[@]}" "${BM[@]}" -o "/build/$NAME-linux-arm64$(extension linux)" "$PACK_RELPATH"
311+
GOCACHE=/gocache/linux/arm64 CC=aarch64-linux-gnueabi-gcc CXX=aarch64-linux-gnueabihf-g++ GOOS=linux GOARCH=arm64 CGO_ENABLED=1 $GOBIN build $V $X $TP $BV "${MOD[@]}" "${T[@]}" "${LDF[@]}" "${GC[@]}" "${BM[@]}" -o "/build/$NAME-linux-arm64$(extension linux)" "$PACK_RELPATH"
312312
fi
313313
if { [ "$XGOOS" == "." ] || [ "$XGOOS" == "linux" ]; } && { [ "$XGOARCH" == "." ] || [ "$XGOARCH" == "mips64" ]; }; then
314314
echo "Compiling for linux/mips64..."

0 commit comments

Comments
 (0)