From bf7f8017069c4d7497850da84848b96b36a5b14e Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Sun, 1 Apr 2018 13:57:04 +0100 Subject: [PATCH] parsec: export env outside of loop and before . env.sh, update submodule --- parsec-benchmark/external.mk | 28 +++++++++++++++------------- parsec-benchmark/parsec-benchmark | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/parsec-benchmark/external.mk b/parsec-benchmark/external.mk index ce92493..0e184f9 100644 --- a/parsec-benchmark/external.mk +++ b/parsec-benchmark/external.mk @@ -15,19 +15,21 @@ define PARSEC_BENCHMARK_BUILD_CMDS '$(PARSEC_BENCHMARK_PKGDIR)/parsec-benchmark/get-inputs' $(if $(filter $(V),1),-v,) '$(DL_DIR)' '$(@D)/' # We run the benchmarks with the wrong arch here to generate the inputs on the host. # This is because on gem5 this takes too long to do. - cd $(@D) && . env.sh && for pkg in $(BR2_PACKAGE_PARSEC_BENCHMARK_BUILD_LIST); do \ - export GNU_TARGET_NAME='$(GNU_TARGET_NAME)'; \ - export GNU_HOST_NAME='$(GNU_HOST_NAME)'; \ - export HOSTCC='$(HOSTCC)'; \ - export M4='$(HOST_DIR)/usr/bin/m4'; \ - export MAKE='$(MAKE)'; \ - export OSTYPE=linux; \ - export TARGET_CROSS='$(TARGET_CROSS)'; \ - export CC="$(TARGET_CC)"; \ - export CPP="$(TARGET_CPP)"; \ - export CXX="$(TARGET_CXX)"; \ - export HOSTTYPE=$(BR2_ARCH); \ - parsecmgmt -a build -p $$pkg; \ + export GNU_TARGET_NAME='$(GNU_TARGET_NAME)' && \ + export GNU_HOST_NAME='$(GNU_HOST_NAME)' && \ + export HOSTCC='$(HOSTCC)' && \ + export M4='$(HOST_DIR)/usr/bin/m4' && \ + export MAKE='$(MAKE)' && \ + export OSTYPE=linux && \ + export TARGET_CROSS='$(TARGET_CROSS)' && \ + export CC="$(TARGET_CC)" && \ + export CPP="$(TARGET_CPP)" && \ + export CXX="$(TARGET_CXX)" && \ + export HOSTTYPE=$(BR2_ARCH) && \ + cd $(@D) && \ + . env.sh && \ + for pkg in $(BR2_PACKAGE_PARSEC_BENCHMARK_BUILD_LIST); do \ + parsecmgmt -a build -p $$pkg && \ if [ ! '$(BR2_PACKAGE_PARSEC_BENCHMARK_PARSECMGMT)' = y ]; then \ parsecmgmt -a run -p $$pkg -i $(BR2_PACKAGE_PARSEC_BENCHMARK_INPUT_SIZE); \ fi \ diff --git a/parsec-benchmark/parsec-benchmark b/parsec-benchmark/parsec-benchmark index 4dbc5e3..d5fa6dc 160000 --- a/parsec-benchmark/parsec-benchmark +++ b/parsec-benchmark/parsec-benchmark @@ -1 +1 @@ -Subproject commit 4dbc5e3d15c7595b8ad524d6e03604416c1886a4 +Subproject commit d5fa6dc768e59f26330add3cbeb458ce61ce4d6e