Replace /bin/cp with cp for nix-build (#730)

* 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 <[email protected]> * Call getconf(1) relative to `PATH` Signed-off-by: Vincent Haupert <[email protected]> Co-authored-by: Vincent Haupert <[email protected]>
intel · Jan 5, 2022 · 2ee53db · 2ee53db
1 parent 71211ef
commit 2ee53db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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

diff --git 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
 )