Skip to content

Commit af8be1c

Browse files
committed
[FAB-9363] Remove ccenv dep from peer binary build
The peer binary does not depend on ccenv to build, only to run. We should express the actual dependency. Change-Id: I8c96e1bdc701a39b32717e74cf63d7b367cc7276 Signed-off-by: Greg Haskins <gregory.haskins@gmail.com>
1 parent 44d51a8 commit af8be1c

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,9 @@ buildenv: $(BUILD_DIR)/image/buildenv/$(DUMMY)
175175

176176
$(BUILD_DIR)/image/testenv/$(DUMMY): $(BUILD_DIR)/image/buildenv/$(DUMMY)
177177
testenv: $(BUILD_DIR)/image/testenv/$(DUMMY)
178+
ccenv: $(BUILD_DIR)/image/ccenv/$(DUMMY)
178179

179-
unit-test: unit-test-clean peer-docker testenv
180+
unit-test: unit-test-clean peer-docker testenv ccenv
180181
cd unit-test && docker-compose up --abort-on-container-exit --force-recreate && docker-compose down
181182

182183
unit-tests: unit-test
@@ -242,10 +243,6 @@ $(BUILD_DIR)/docker/gotools: gotools.mk
242243
$(BASE_DOCKER_NS)/fabric-baseimage:$(BASE_DOCKER_TAG) \
243244
make -f gotools.mk GOTOOLS_BINDIR=/opt/gotools/bin GOTOOLS_GOPATH=/opt/gotools/obj
244245

245-
# Both peer and peer-docker depend on ccenv (all docker env images it supports).
246-
$(BUILD_DIR)/bin/peer: $(BUILD_DIR)/image/ccenv/$(DUMMY)
247-
$(BUILD_DIR)/image/peer/$(DUMMY): $(BUILD_DIR)/image/ccenv/$(DUMMY)
248-
249246
$(BUILD_DIR)/bin/%: $(PROJECT_FILES)
250247
@mkdir -p $(@D)
251248
@echo "$@"

0 commit comments

Comments
 (0)