summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
author오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>2019-01-08 19:12:50 +0900
committerGitHub Enterprise <noreply-CODE@samsung.com>2019-01-08 19:12:50 +0900
commitd7cfd712100bfbaa73b613f73c74c9090023ba53 (patch)
tree9d081792dd961406083a489bbf81649bc1828cb8 /Makefile
parent72a63463907cc5e5d895a67bd8eab95e9020e272 (diff)
downloadnnfw-d7cfd712100bfbaa73b613f73c74c9090023ba53.tar.gz
nnfw-d7cfd712100bfbaa73b613f73c74c9090023ba53.tar.bz2
nnfw-d7cfd712100bfbaa73b613f73c74c9090023ba53.zip
Use acl pre-built binary (#4179)
Remove workaround to avoid build fail by acl version update Use pre-built acl v18.11 binary Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index fda5b0c01..7a9b72736 100644
--- a/Makefile
+++ b/Makefile
@@ -111,9 +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
+ifneq ($(EXT_ACL_FOLDER),)
+ ACL_FOLDER_BUILD=$(EXT_ACL_FOLDER)
+endif
all: build
@@ -172,13 +172,13 @@ install_internal:
touch $(TIMESTAMP_INSTALL)
internal_acl_build: configure_internal
-#ifeq ($(EXT_ACL_FOLDER),)
+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
+endif
internal_acl_install:
@echo $(ACL_FOLDER_BUILD)