Fixed tgmp dir

parent 44768e6a
......@@ -251,8 +251,8 @@ ECHO_N = -n
ECHO_T =
ENCLAVE_SIGN_TARGET = signed_enclave_dev
EXEEXT =
GMP_CPPFLAGS =
GMP_LDFLAGS =
GMP_CPPFLAGS = -I/d/sgxd/gmp_build/include
GMP_LDFLAGS = -L/d/sgxd/gmp_build/lib
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
......@@ -275,10 +275,10 @@ PACKAGE_URL =
PACKAGE_VERSION = 1.0
PATH_SEPARATOR = :
SET_MAKE =
SGXSDK = /d/sgxd/sgx-sdk-build/sgxsdk
SGXSDK_BINDIR = /d/sgxd/sgx-sdk-build/sgxsdk/bin/x64
SGXSDK_INCDIR = /d/sgxd/sgx-sdk-build/sgxsdk/include
SGXSDK_LIBDIR = /d/sgxd/sgx-sdk-build/sgxsdk/lib64
SGXSDK = ./sgx-sdk-build/sgxsdk
SGXSDK_BINDIR = ./sgx-sdk-build/sgxsdk/bin/x64
SGXSDK_INCDIR = ./sgx-sdk-build/sgxsdk/include
SGXSDK_LIBDIR = ./sgx-sdk-build/sgxsdk/lib64
SGXSSL = /opt/intel/sgxssl
SGXSSL_INCDIR = /opt/intel/sgxssl/include
SGXSSL_LIBDIR = /opt/intel/sgxssl/lib64
......@@ -297,8 +297,8 @@ SGX_UAE_SERVICE_LIB = sgx_uae_service
SGX_URTS_LIB = sgx_urts
SHELL = /bin/bash
STRIP =
TGMP_CPPFLAGS =
TGMP_LDFLAGS =
TGMP_CPPFLAGS = -I/d/sgxd/gmp_build/include
TGMP_LDFLAGS = -L/d/sgxd/gmp_build/lib
VERSION = 1.0
abs_builddir = /d/sgxd
abs_srcdir = /d/sgxd
......
......@@ -4162,7 +4162,12 @@ fi
SGXSDK="${PWD}/sgx-sdk-build/sgxsdk"
# Check whether --with-sgxsdk was given.
if test "${with_sgxsdk+set}" = set; then :
withval=$with_sgxsdk; SGXSDK=$withval
else
SGXSDK="detect"
fi
if test "x$sgxsim" = "yes"; then :
......@@ -4254,9 +4259,22 @@ else
fi
SGX_DEBUG_FLAGS=$_sgxdebug
if test "x$SGX_SDK" = "x"; then :
SGXSDK=detect
else
SGXSDK=env
fi
if test "x$SGXSDK" = "xenv"; then :
SGXSDK=$SGX_SDK
elif test "x$SGXSDK" != "xdetect"; then :
if test -d ${SGXSDK}; then :
elif test -d /opt/intel/sgxsdk; then :
SGXSDK=/opt/intel/sgxsdk
elif test -d ~/sgxsdk; then :
SGXSDK=~/sgxsdk
elif test -d ./sgx-sdk-build/sgxsdk; then :
SGXSDK=./sgx-sdk-build/sgxsdk
else
as_fn_error $? "Can't detect your Intel SGX SDK installation directory" "$LINENO" 5
fi
......@@ -4366,8 +4384,8 @@ $as_echo "$as_me: enabling SGX... ${ac_cv_enable_sgx}" >&6;}
ac_cv_sgx_init=yes
gmpdir=
tgmpdir=
gmpdir=${PWD}/gmp_build
tgmpdir=${PWD}/tgmp_build
# Check whether --with-gmpdir was given.
......
......@@ -11,8 +11,8 @@ AM_PROG_CC_C_O
SGX_INIT()
gmpdir=
tgmpdir=
gmpdir=${PWD}/gmp_build
tgmpdir=${PWD}/tgmp_build
AC_ARG_WITH([gmpdir],
AC_HELP_STRING([--with-gmpdir=PATH], [specify the libgmp directory]),
......
......@@ -219,8 +219,8 @@ ECHO_N = -n
ECHO_T =
ENCLAVE_SIGN_TARGET = signed_enclave_dev
EXEEXT = .so
GMP_CPPFLAGS =
GMP_LDFLAGS =
GMP_CPPFLAGS = -I/d/sgxd/gmp_build/include
GMP_LDFLAGS = -L/d/sgxd/gmp_build/lib
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
......@@ -243,10 +243,10 @@ PACKAGE_URL =
PACKAGE_VERSION = 1.0
PATH_SEPARATOR = :
SET_MAKE =
SGXSDK = /d/sgxd/sgx-sdk-build/sgxsdk
SGXSDK_BINDIR = /d/sgxd/sgx-sdk-build/sgxsdk/bin/x64
SGXSDK_INCDIR = /d/sgxd/sgx-sdk-build/sgxsdk/include
SGXSDK_LIBDIR = /d/sgxd/sgx-sdk-build/sgxsdk/lib64
SGXSDK = ./sgx-sdk-build/sgxsdk
SGXSDK_BINDIR = ./sgx-sdk-build/sgxsdk/bin/x64
SGXSDK_INCDIR = ./sgx-sdk-build/sgxsdk/include
SGXSDK_LIBDIR = ./sgx-sdk-build/sgxsdk/lib64
SGXSSL = /opt/intel/sgxssl
SGXSSL_INCDIR = /opt/intel/sgxssl/include
SGXSSL_LIBDIR = /opt/intel/sgxssl/lib64
......@@ -265,8 +265,8 @@ SGX_UAE_SERVICE_LIB = sgx_uae_service
SGX_URTS_LIB = sgx_urts
SHELL = /bin/bash
STRIP =
TGMP_CPPFLAGS =
TGMP_LDFLAGS =
TGMP_CPPFLAGS = -I/d/sgxd/gmp_build/include
TGMP_LDFLAGS = -L/d/sgxd/gmp_build/lib
VERSION = 1.0
abs_builddir = /d/sgxd/secure_enclave
abs_srcdir = /d/sgxd/secure_enclave
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment