summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
author박종현/On-Device Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>2018-12-24 14:03:04 +0900
committer이춘석/On-Device Lab(SR)/Staff Engineer/삼성전자 <chunseok.lee@samsung.com>2018-12-24 14:03:04 +0900
commit5e4e7e27d7b4a20ef300bb4577c4e14369db7e06 (patch)
tree00692257dc011d019f1145e90889d7888a8b690c /Makefile
parentaf40643e1c8ba3af8656104a01a5587e7ccdc874 (diff)
downloadnnfw-5e4e7e27d7b4a20ef300bb4577c4e14369db7e06.tar.gz
nnfw-5e4e7e27d7b4a20ef300bb4577c4e14369db7e06.tar.bz2
nnfw-5e4e7e27d7b4a20ef300bb4577c4e14369db7e06.zip
Fix ARMCompute build script bug (#4097)
The current version is unable to build ARMCompute from the downloaded source. Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 9 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 52af9fb98..85b63f2f2 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,15 @@ ifeq ($(BENCHMARK_ACL_BUILD),1)
OPTIONS+= -DBUILD_BENCHMARK_ACL=1
endif
+ifneq ($(EXT_ACL_FOLDER),)
+ OPTIONS+= -DBUILD_ARMCOMPUTE=OFF
+ OPTIONS+= -DARMCompute_EXTDIR=$(EXT_ACL_FOLDER)
+endif
+
+ifneq ($(OBS_BUILD),OFF)
+ OPTIONS+= -DBUILD_ARMCOMPUTE=FALSE
+endif
+
ifeq ($(PARALLEL_BUILD),1)
# Get number of processors (linux only for now)
ifeq ($(HOST_OS),linux)
@@ -178,13 +187,6 @@ 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)