Skip to content

Commit a5a38a7

Browse files
amd build.
1 parent 2a9d808 commit a5a38a7

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ endif
131131

132132
ALL_BINARIES = $(foreach binary, $(BINARIES) $(BINARIES_LINUX_ONLY), ./$(binary)) \
133133
$(foreach platform, $(LINUX_PLATFORMS), $(foreach binary, $(BINARIES) $(BINARIES_LINUX_ONLY), output/$(platform)/$(binary))) \
134-
$(foreach binary, $(BINARIES), output/windows_amd64/$(binary).exe)
134+
# skip windows bin build
135+
# $(foreach binary, $(BINARIES), output/windows_amd64/$(binary).exe)
136+
$(foreach binary, $(BINARIES))
135137
ALL_TARBALLS = $(foreach platform, $(PLATFORMS), $(NPD_NAME_VERSION)-$(platform).tar.gz)
136138

137139
output/windows_amd64/bin/%.exe: $(PKG_SOURCES)
@@ -150,8 +152,6 @@ output/windows_amd64/test/bin/%.exe: $(PKG_SOURCES)
150152
-tags "$(WINDOWS_BUILD_TAGS)" \
151153
./test/e2e/$(subst -,,$*)
152154

153-
# =x86_64-linux-gnu-gcc need yum install gcc-x86_64-linux-gnu.x86_64
154-
155155
output/linux_amd64/bin/%: $(PKG_SOURCES)
156156
GOOS=linux GOARCH=amd64 CGO_ENABLED=$(CGO_ENABLED) GO111MODULE=on \
157157
# CC=x86_64-linux-gnu-gcc go build \
@@ -174,7 +174,8 @@ output/linux_amd64/test/bin/%: $(PKG_SOURCES)
174174

175175
output/linux_arm64/bin/%: $(PKG_SOURCES)
176176
GOOS=linux GOARCH=arm64 CGO_ENABLED=$(CGO_ENABLED) GO111MODULE=on \
177-
CC=aarch64-linux-gnu-gcc go build \
177+
# CC=aarch64-linux-gnu-gcc go build \
178+
CC=aarch64-redhat-linux-gcc go build \
178179
-mod vendor \
179180
-o $@ \
180181
-ldflags '-X $(PKG)/pkg/version.version=$(VERSION)' \
@@ -184,7 +185,8 @@ output/linux_arm64/bin/%: $(PKG_SOURCES)
184185

185186
output/linux_arm64/test/bin/%: $(PKG_SOURCES)
186187
GOOS=linux GOARCH=arm64 CGO_ENABLED=$(CGO_ENABLED) GO111MODULE=on \
187-
CC=aarch64-linux-gnu-gcc go build \
188+
# CC=aarch64-linux-gnu-gcc go build \
189+
CC=aarch64-redhat-linux-gcc go build \
188190
-mod vendor \
189191
-o $@ \
190192
-tags "$(LINUX_BUILD_TAGS)" \

builder/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
# How to build multi-arch docker with docker buildx
3+
## debug with log input, use the cmd below.
4+
```
5+
docker buildx build -t npd-test:v1 --platform linux/arm64 . -f ./builder/Dockerfile.dind --progress plain
6+
```

0 commit comments

Comments
 (0)