From 8e77ce18db597484536f6a6538cc4c795ab4d739 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Mon, 12 Nov 2018 11:06:02 +0900 Subject: [PATCH] Use pre-built acl by environment variable (#3533) * Use pre-built acl by environment variable When environment variable EXT_ACL_FOLDER is set, use pre-built acl binary Signed-off-by: Hyeongseok Oh * Fix if-else syntax in Makefile --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 44234de..59fa357 100644 --- a/Makefile +++ b/Makefile @@ -111,6 +111,9 @@ endif ACL_FOLDER_NAME=$(ACL_BUILD_OUT).$(BUILD_TYPE_LC) ACL_COMMAND+= build_dir=$(ACL_FOLDER_NAME) ACL_FOLDER_BUILD=$(ACL_FOLDER)/build/$(ACL_FOLDER_NAME) +ifneq ($(EXT_ACL_FOLDER),) + ACL_FOLDER_BUILD=$(EXT_ACL_FOLDER) +endif ifeq ($(OBS_BUILD),ON) UPDATE_MODULE=0 @@ -169,20 +172,23 @@ install_internal: touch $(TIMESTAMP_INSTALL) internal_acl_build: configure_internal +ifeq ($(EXT_ACL_FOLDER),) ifeq ($(TARGET_OS),android) cd $(ACL_FOLDER) && CXX=clang++ CC=clang PATH=$(ANDROID_GNUSTL_PATH) $(ACL_COMMAND) else cd $(ACL_FOLDER) && $(ACL_COMMAND) endif +endif internal_acl_install: + @echo $(ACL_FOLDER_BUILD) @mkdir -vp $(INSTALL_PATH)/lib @cp -v $(ACL_FOLDER_BUILD)/libarm_compute_core.so $(INSTALL_PATH)/lib/. @cp -v $(ACL_FOLDER_BUILD)/libarm_compute_graph.so $(INSTALL_PATH)/lib/. @cp -v $(ACL_FOLDER_BUILD)/libarm_compute.so $(INSTALL_PATH)/lib/. external_acl: -ifneq ($(EXT_ACL_FOLDER),"") +ifneq ($(EXT_ACL_FOLDER),) @mkdir -vp $(INSTALL_PATH)/lib @cp -v $(EXT_ACL_FOLDER)/libarm_compute_core.so $(INSTALL_PATH)/lib/. @cp -v $(EXT_ACL_FOLDER)/libarm_compute_graph.so $(INSTALL_PATH)/lib/. -- 2.7.4