Skip to content

Commit 2ee53db

Browse files
sbellemveehaitch
andauthored
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]>
1 parent 71211ef commit 2ee53db

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

buildenv.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ LINUX_UNITTESTS := $(ROOT_DIR)/unittests
7070
DCAP_DIR := $(LINUX_EXTERNAL_DIR)/dcap_source
7171
LIBUNWIND_DIR := $(ROOT_DIR)/sdk/cpprt/linux/libunwind
7272

73-
CP := /bin/cp -f
73+
CP := cp -f
7474
MKDIR := mkdir -p
7575
STRIP := strip
7676
OBJCOPY := objcopy

psw/ae/aesm_service/source/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ set(CMAKE_SKIP_BUILD_RPATH true)
3939
########## SGX SDK Settings ##########
4040
set(SGX_ARCH x64)
4141
execute_process (
42-
COMMAND /usr/bin/getconf LONG_BIT
42+
COMMAND getconf LONG_BIT
4343
OUTPUT_VARIABLE LONG_BIT
4444
)
4545

0 commit comments

Comments
 (0)