diff options
| author | 오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com> | 2019-01-07 17:42:11 +0900 |
|---|---|---|
| committer | 이춘석/On-Device Lab(SR)/Staff Engineer/삼성전자 <chunseok.lee@samsung.com> | 2019-01-07 17:42:11 +0900 |
| commit | eddc0157eeba4766ce3b121fe009a24788d262ce (patch) | |
| tree | 94a77bb3d65adffaf38eb60707a0b0360785bf4b /Makefile | |
| parent | 37762d473d935a48555de0c6c416da9d9a5529ef (diff) | |
| download | nnfw-eddc0157eeba4766ce3b121fe009a24788d262ce.tar.gz nnfw-eddc0157eeba4766ce3b121fe009a24788d262ce.tar.bz2 nnfw-eddc0157eeba4766ce3b121fe009a24788d262ce.zip | |
Revert acl cmake build (#4164)
Revert acl cmake build to update acl v18.11
This reverts commit 5e4e7e27d7b4a20ef300bb4577c4e14369db7e06.
This reverts commit 7d484e5c3acd4b3ad8039226a25f78d26748be0a.
Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 24 |
1 files changed, 8 insertions, 16 deletions
@@ -58,15 +58,6 @@ 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) @@ -139,13 +130,7 @@ clean: rm -rf $(WORKDIR) rm -rf externals/*.stamp -acl: -ifeq ($(EXT_ACL_FOLDER),) - # Skip internal_acl_build when EXT_ACL_FOLDER is set - # NOTE internal_acl_build depends on configure - make internal_acl_build -endif - make internal_acl_install +acl: internal_acl_build internal_acl_install check: check_internal @@ -187,6 +172,13 @@ 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) |