From 9612915e06337d3040abec212334c0fab48dfc02 Mon Sep 17 00:00:00 2001 From: Sylvain Bellemare Date: Thu, 17 Jun 2021 21:39:09 -0400 Subject: [PATCH 1/2] Replace /bin/cp with cp for nix-build When using nix-build, /bin/cp cannot be found as there's nothing under /bin except for sh. Signed-off-by: Sylvain Bellemare --- buildenv.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildenv.mk b/buildenv.mk index 9ff9c8cbb..9c8ca2446 100644 --- a/buildenv.mk +++ b/buildenv.mk @@ -70,7 +70,7 @@ LINUX_UNITTESTS := $(ROOT_DIR)/unittests DCAP_DIR := $(LINUX_EXTERNAL_DIR)/dcap_source LIBUNWIND_DIR := $(ROOT_DIR)/sdk/cpprt/linux/libunwind -CP := /bin/cp -f +CP := cp -f MKDIR := mkdir -p STRIP := strip OBJCOPY := objcopy From 7aa279b205827090b164514b322ae6f078fbca5a Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 25 Nov 2021 19:11:05 +0100 Subject: [PATCH 2/2] Call getconf(1) relative to `PATH` Signed-off-by: Vincent Haupert --- psw/ae/aesm_service/source/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psw/ae/aesm_service/source/CMakeLists.txt b/psw/ae/aesm_service/source/CMakeLists.txt index 045169d65..ac60d8816 100644 --- a/psw/ae/aesm_service/source/CMakeLists.txt +++ b/psw/ae/aesm_service/source/CMakeLists.txt @@ -39,7 +39,7 @@ set(CMAKE_SKIP_BUILD_RPATH true) ########## SGX SDK Settings ########## set(SGX_ARCH x64) execute_process ( - COMMAND /usr/bin/getconf LONG_BIT + COMMAND getconf LONG_BIT OUTPUT_VARIABLE LONG_BIT )