Consolidate icon/build.mk according to changes of Makefile
#
LCIMPORT_IMAGE = goloop/lcimport:$(GL_TAG)
-LCIMPORT_DOCKER_DIR = $(BUILD_ROOT)/build/lcimport
+LCIMPORT_DOCKER_DIR = $(BUILD_DIR)/lcimport
lcimport_LDFLAGS = -X 'main.version=$(GL_VERSION)'
GOCHAIN_ICON_IMAGE = goloop/gochain-icon:$(GL_TAG)
-GOCHAIN_ICON_DOCKER_DIR = $(BUILD_ROOT)/build/gochain-icon
+GOCHAIN_ICON_DOCKER_DIR = $(BUILD_DIR)/gochain-icon
GOLOOP_ICON_IMAGE = goloop-icon:$(GL_TAG)
-GOLOOP_ICON_DOCKER_DIR = $(BUILD_ROOT)/build/goloop-icon
+GOLOOP_ICON_DOCKER_DIR = $(BUILD_DIR)/goloop-icon
-ICONEE_DIST_DIR = $(BUILD_ROOT)/build/iconee/dist
+ICONEE_DIST_DIR = $(BUILD_DIR)/iconee/dist
$(ICONEE_DIST_DIR):
@ mkdir -p $@
@@ -26,31 +26,31 @@ iconexec:
python3 setup.py bdist_wheel -d $(ICONEE_DIST_DIR) ; \
rm -rf iconee.egg-info
-lcimport-image: base-image-py pyrun-iconexec gorun-lcimport-linux
+lcimport-image: base-image-py pyrun-iconexec gorun-lcimport
@ echo "[#] Building lcimport for $(GL_VERSION)"
@ \
rm -rf $(LCIMPORT_DOCKER_DIR); \
- BIN_DIR=$(abspath $(LINUX_BIN_DIR)) \
+ BIN_DIR=$(CROSSBIN_ROOT)-$$(docker inspect $(BASE_PY_IMAGE) --format "{{.Os}}-{{.Architecture}}") \
IMAGE_BASE=$(BASE_PY_IMAGE) \
LCIMPORT_VERSION=$(GL_VERSION) \
GOBUILD_TAGS="$(GOBUILD_TAGS)" \
$(BUILD_ROOT)/docker/lcimport/update.sh $(LCIMPORT_IMAGE) $(BUILD_ROOT) $(LCIMPORT_DOCKER_DIR)
-gochain-icon-image: base-image-all pyrun-iconexec gorun-gochain-linux javarun-javaexec
+gochain-icon-image: base-image-all pyrun-iconexec gorun-gochain javarun-javaexec
@ echo "[#] Building image $(GOCHAIN_ICON_IMAGE) for $(GL_VERSION)"
@ \
rm -rf $(GOCHAIN_ICON_DOCKER_DIR); \
- BIN_DIR=$(abspath $(LINUX_BIN_DIR)) \
+ BIN_DIR=$(CROSSBIN_ROOT)-$$(docker inspect $(BASE_IMAGE) --format "{{.Os}}-{{.Architecture}}") \
IMAGE_BASE=$(BASE_IMAGE) \
GOCHAIN_ICON_VERSION=$(GL_VERSION) \
GOBUILD_TAGS="$(GOBUILD_TAGS)" \
$(BUILD_ROOT)/docker/gochain-icon/update.sh $(GOCHAIN_ICON_IMAGE) $(BUILD_ROOT) $(GOCHAIN_ICON_DOCKER_DIR)
-goloop-icon-image: base-image-all pyrun-iconexec gorun-goloop-linux javarun-javaexec
+goloop-icon-image: base-image-all pyrun-iconexec gorun-goloop javarun-javaexec
@ echo "[#] Building image $(GOLOOP_ICON_IMAGE) for $(GL_VERSION)"
@ \
rm -rf $(GOLOOP_ICON_DOCKER_DIR); \
- BIN_DIR=$(abspath $(LINUX_BIN_DIR)) \
+ BIN_DIR=$(CROSSBIN_ROOT)-$$(docker inspect $(BASE_IMAGE) --format "{{.Os}}-{{.Architecture}}") \
IMAGE_BASE=$(BASE_IMAGE) \
GOLOOP_ICON_VERSION=$(GL_VERSION) \
GOBUILD_TAGS="$(GOBUILD_TAGS)" \
