Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Commit 761b834

Browse files
committed
build: Use bagccgop-provided HOST env variable for GCC host triplet
1 parent 074c836 commit 761b834

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Hydrunfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if [ "$1" = "clients" ]; then
1414

1515
# Install dependencies
1616
apt update
17-
apt install -y libssl-dev protobuf-compiler build-essential automake file
17+
apt install -y zlib1g-dev protobuf-compiler build-essential automake file
1818

1919
# Generate bindings
2020
make depend
@@ -33,8 +33,8 @@ if [ "$1" = "servers" ]; then
3333
install /tmp/bagccgop /usr/local/bin
3434

3535
# Build
36-
GOFLAGS='-gccgoflags=-static' bagccgop -x '(linux/alpha|linux/mipsle)' -j1 -b dhclientd -r 'make depend' -s 'protobuf-compiler,build-essential,automake' -p 'chmod +w /root/go/pkg/mod/google.golang.org/grpc@*/internal/channelz/types_linux.go && sed -i "s/SO_SNDTIMEO/SO_RCVTIMEO/" /root/go/pkg/mod/google.golang.org/grpc@*/internal/channelz/types_linux.go && make build/dhclientd DST=$DST' -d out
37-
GOFLAGS='-gccgoflags=-static' bagccgop -x '(linux/alpha|linux/mipsle)' -j1 -b dhcpdd -r 'make depend' -s 'protobuf-compiler,build-essential,automake' -p 'chmod +w /root/go/pkg/mod/google.golang.org/grpc@*/internal/channelz/types_linux.go && sed -i "s/SO_SNDTIMEO/SO_RCVTIMEO/" /root/go/pkg/mod/google.golang.org/grpc@*/internal/channelz/types_linux.go && make build/dhcpdd DST=$DST' -d out
36+
GOFLAGS='-gccgoflags=-static' bagccgop -x '(linux/alpha|linux/mipsle|linux/ppc$|linux/riscv64|linux/arm$)' -j1 -b dhclientd -r 'make depend' -s 'protobuf-compiler,build-essential,automake,file' -m 'zlib1g-dev' -p 'chmod +w /root/go/pkg/mod/google.golang.org/grpc@*/internal/channelz/types_linux.go && sed -i "s/SO_SNDTIMEO/SO_RCVTIMEO/" /root/go/pkg/mod/google.golang.org/grpc@*/internal/channelz/types_linux.go && make build/dhclientd DST=$DST' -d out
37+
GOFLAGS='-gccgoflags=-static' bagccgop -x '(linux/alpha|linux/mipsle|linux/ppc$|linux/riscv64|linux/arm$)' -j1 -b dhcpdd -r 'make depend' -s 'protobuf-compiler,build-essential,automake,file' -m 'zlib1g-dev' -p 'chmod +w /root/go/pkg/mod/google.golang.org/grpc@*/internal/channelz/types_linux.go && sed -i "s/SO_SNDTIMEO/SO_RCVTIMEO/" /root/go/pkg/mod/google.golang.org/grpc@*/internal/channelz/types_linux.go && make build/dhcpdd DST=$DST' -d out
3838

3939
exit 0
4040
fi

pkg/workers/dhcpd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package workers
22

3-
//go:generate sh -c "rm -rf dhcp && git clone --depth 1 https://gitlab.isc.org/isc-projects/dhcp.git && cd dhcp && ./configure $([ -n \"${CC}\" ] && echo --host=\"${CC}\") && make"
3+
//go:generate sh -c "rm -rf dhcp && git clone --depth 1 https://gitlab.isc.org/isc-projects/dhcp.git && cd dhcp && ./configure $([ -n \"${HOST}\" ] && echo --host=\"${HOST}\") --with-randomdev=no && make"
44

55
import (
66
_ "embed"

0 commit comments

Comments
 (0)