@@ -33,7 +33,10 @@ ifeq ($(DEBUG), 1)
33
33
GO_BUILD_FLAGS += -gcflags "all=-N -l"
34
34
GO_LDFLAGS=
35
35
endif
36
- GO_BUILD_FLAGS += -tags "containers_image_openpgp netgo exclude_graphdriver_devicemapper static osusergo exclude_graphdriver_btrfs" -trimpath -ldflags "$(GO_LDFLAGS ) "
36
+ # Fixed container dependency issues
37
+ # Link -> https://github.com/containers/image/pull/271/files
38
+ # For btrfs, we are currently only using overlays, so we don't need to include btrfs, otherwise we need to fix some lib issues
39
+ GO_BUILD_FLAGS += -tags "containers_image_openpgp exclude_graphdriver_devicemapper exclude_graphdriver_btrfs"
37
40
38
41
# ifeq ($(GOOS),windows)
39
42
# GO_OUT_EXT := .exe
@@ -103,7 +106,7 @@ go.bin.%:
103
106
$(eval COMMAND := $(word 2,$(subst ., ,$* ) ) )
104
107
$(eval PLATFORM := $(word 1,$(subst ., ,$* ) ) )
105
108
@echo " ===========> Verifying binary $( COMMAND) $( VERSION) for $( PLATFORM) "
106
- @if [ ! -f $( BIN_DIR) /$( PLATFORM) /$( COMMAND) ]; then echo $(MAKE ) go.build PLATFORM=$(PLATFORM ) ; fi
109
+ @if [ ! -f $( BIN_DIR) /$( COMMAND ) / $( PLATFORM) /$( COMMAND) ]; then echo $(MAKE ) go.build PLATFORM=$(PLATFORM ) ; fi
107
110
108
111
# # go.build.%: Build binary for specific platform
109
112
.PHONY : go.build.%
@@ -114,22 +117,23 @@ go.build.%:
114
117
$(eval ARCH := $(word 2,$(subst _, ,$(PLATFORM ) ) ) )
115
118
@echo " COMMAND=$( COMMAND) "
116
119
@echo " PLATFORM=$( PLATFORM) "
117
- @echo " OS=$( OS) "
118
- @echo " ARCH=$( ARCH) "
119
- @echo " BINS=$( BINS) "
120
120
@echo " BIN_DIR=$( BIN_DIR) "
121
- @echo " ===========> Building binary $( COMMAND) $( VERSION) for $( OS) $( ARCH) "
122
- @mkdir -p $(OUTPUT_DIR ) /bin/$(OS ) /$(ARCH )
123
-
124
- # @CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) $(GO) build $(GO_BUILD_FLAGS) -o $(OUTPUT_DIR)/bin/$(OS)/$(ARCH)/$(COMMAND)$(GO_OUT_EXT) $(ROOT_PACKAGE)/cmd/$(COMMAND)
121
+ @echo " ===========> Building binary $( COMMAND) $( VERSION) for $( OS) _$( ARCH) "
122
+ @mkdir -p $(BIN_DIR ) /$(COMMAND ) /$(PLATFORM )
123
+ @if [ " $( COMMAND) " == " sealer" ] || [ " $( COMMAND) " == " seautil" ]; then \
124
+ CGO_ENABLED=1; \
125
+ CC=x86_64-linux-gnu-gcc; \
126
+ if [ " $( ARCH) " == " arm64" ]; then \
127
+ CC=aarch64-linux-gnu-gcc; \
128
+ fi ; \
129
+ CGO_ENABLED=$$ CGO_ENABLED CC=$$ CC GOOS=$(OS ) GOARCH=$(ARCH ) $(GO ) build $(GO_BUILD_FLAGS ) -o $(BIN_DIR ) /$(COMMAND ) /$(PLATFORM ) -mod vendor $(ROOT_PACKAGE ) /cmd/$(COMMAND ) ; \
130
+ else \
131
+ CGO_ENABLED=0 GOOS=$(OS ) GOARCH=$(ARCH ) $(GO ) build $(GO_BUILD_FLAGS ) -o $(BIN_DIR ) /$(COMMAND ) /$(PLATFORM ) -mod vendor $(ROOT_PACKAGE ) /cmd/$(COMMAND ) ; \
132
+ fi
125
133
126
134
# # go.build: Build binaries
127
135
.PHONY : go.build
128
136
go.build : go.build.verify $(addprefix go.build., $(addprefix $(PLATFORM ) ., $(BINS ) ) )
129
- @echo " COMMAND=$( COMMAND) "
130
- @echo " PLATFORM=$( PLATFORM) "
131
- @echo " OS=$( OS) "
132
- @echo " ARCH=$( ARCH) "
133
137
@echo " ===========> Building binary $( BINS) $( VERSION) for $( PLATFORM) "
134
138
135
139
# # go.build.multiarch: Build multi-arch binaries
@@ -153,7 +157,7 @@ go.lint: tools.verify.golangci-lint
153
157
# # go.test: Run unit test
154
158
.PHONY : go.test
155
159
go.test :
156
- @$(GO ) test ./...
160
+ @$(GO ) test $( GO_BUILD_FLAGS ) ./...
157
161
158
162
# # go.test.junit-report: Run unit test
159
163
.PHONY : go.test.junit-report
0 commit comments