From: Jacob Lifshay Date: Thu, 21 Jul 2022 01:54:36 +0000 (-0700) Subject: don't run install-deps.sh in parallel X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=02b4776de8b0a8440be2430922bd13751cb2e85d;p=benchmarks.git don't run install-deps.sh in parallel --- diff --git a/.gitignore b/.gitignore index 821c2c2..a045677 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /build* /.cache -/compile_commands.json \ No newline at end of file +/compile_commands.json +/.installed-dependencies diff --git a/Makefile b/Makefile index 295e2dd..67f9c58 100644 --- a/Makefile +++ b/Makefile @@ -6,18 +6,19 @@ common_cmake_flags += -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE reset_make_env = "MAKEFLAGS=" "MFLAGS=" "MAKELEVEL=" "MAKE_TERMERR=" "MAKE_TERMOUT=" -build-ppc64le/Makefile: toolchain-powerpc64le-linux-gnu.cmake CMakeLists.txt +.installed-dependencies: install-deps.sh ./install-deps.sh + touch .installed-dependencies + +build-ppc64le/Makefile: toolchain-powerpc64le-linux-gnu.cmake CMakeLists.txt .installed-dependencies rm -fr build-ppc64le env $(reset_make_env) cmake $(common_cmake_flags) -B build-ppc64le -DCMAKE_TOOLCHAIN_FILE=toolchain-powerpc64le-linux-gnu.cmake -build-aarch64/Makefile: toolchain-aarch64-linux-gnu.cmake CMakeLists.txt - ./install-deps.sh +build-aarch64/Makefile: toolchain-aarch64-linux-gnu.cmake CMakeLists.txt .installed-dependencies rm -fr build-aarch64 env $(reset_make_env) cmake $(common_cmake_flags) -B build-aarch64 -DCMAKE_TOOLCHAIN_FILE=toolchain-aarch64-linux-gnu.cmake -build-x86_64/Makefile: toolchain-x86_64-linux-gnu.cmake CMakeLists.txt - ./install-deps.sh +build-x86_64/Makefile: toolchain-x86_64-linux-gnu.cmake CMakeLists.txt .installed-dependencies rm -fr build-x86_64 env $(reset_make_env) cmake $(common_cmake_flags) -B build-x86_64 -DCMAKE_TOOLCHAIN_FILE=toolchain-x86_64-linux-gnu.cmake @@ -35,5 +36,5 @@ build-x86_64/benchmarks: build-x86_64/Makefile __force-run $(MAKE) -C build-x86_64 benchmarks clean: - rm -fr build-ppc64le build-aarch64 build-x86_64 + rm -fr build-ppc64le build-aarch64 build-x86_64 .installed-dependencies