Fixes

parent f67ce344
...@@ -372,11 +372,12 @@ top_builddir = . ...@@ -372,11 +372,12 @@ top_builddir = .
top_srcdir = . top_srcdir = .
SGX_EDGER8R = $(SGXSDK_BINDIR)/sgx_edger8r SGX_EDGER8R = $(SGXSDK_BINDIR)/sgx_edger8r
SGXSSL_BINDIR = @SGXSSL_BINDIR@ SGXSSL_BINDIR = @SGXSSL_BINDIR@
#AM_CPPFLAGS = -DSKALE_SGX=1 -IlibBLS -Ilibff \ #AM_CPPFLAGS = -DSKALE_SGX=1 -DBINARY_OUTPUT=1 \
# -fno-builtin-memset $(GMP_CPPFLAGS) # -IlibBLS -Ilibff -fno-builtin-memset \
# $(GMP_CPPFLAGS)
AM_CPPFLAGS = -I$(SGXSDK_INCDIR) -DSKALE_SGX=1 \ AM_CPPFLAGS = -I$(SGXSDK_INCDIR) -DSKALE_SGX=1 \
-IlibBLS -Ilibff -fno-builtin-memset \ -DBINARY_OUTPUT=1 -IlibBLS -Ilibff \
$(GMP_CPPFLAGS) -fno-builtin-memset $(GMP_CPPFLAGS)
#AM_LDFLAGS = $(GMP_LDFLAGS) #AM_LDFLAGS = $(GMP_LDFLAGS)
AM_LDFLAGS = -L$(SGXSDK_LIBDIR) $(GMP_LDFLAGS) AM_LDFLAGS = -L$(SGXSDK_LIBDIR) $(GMP_LDFLAGS)
SUBDIRS = EnclaveGmpTest SUBDIRS = EnclaveGmpTest
......
...@@ -45,7 +45,7 @@ EnclaveGmpTest.edl: EnclaveGmpTest/EnclaveGmpTest.edl ...@@ -45,7 +45,7 @@ EnclaveGmpTest.edl: EnclaveGmpTest/EnclaveGmpTest.edl
## AM_CFLAGS = ## AM_CFLAGS =
## AM_CXXFLAGS = ## AM_CXXFLAGS =
AM_CPPFLAGS += -DSKALE_SGX=1 -IlibBLS -Ilibff -fno-builtin-memset $(GMP_CPPFLAGS) AM_CPPFLAGS += -DSKALE_SGX=1 -DBINARY_OUTPUT=1 -IlibBLS -Ilibff -fno-builtin-memset $(GMP_CPPFLAGS)
## Additional targets to remove with 'make clean'. You must list ## Additional targets to remove with 'make clean'. You must list
## any edger8r generated files here. ## any edger8r generated files here.
......
...@@ -372,11 +372,12 @@ top_builddir = @top_builddir@ ...@@ -372,11 +372,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
SGX_EDGER8R = $(SGXSDK_BINDIR)/sgx_edger8r SGX_EDGER8R = $(SGXSDK_BINDIR)/sgx_edger8r
SGXSSL_BINDIR = @SGXSSL_BINDIR@ SGXSSL_BINDIR = @SGXSSL_BINDIR@
@SGX_ENABLED_FALSE@AM_CPPFLAGS = -DSKALE_SGX=1 -IlibBLS -Ilibff \ @SGX_ENABLED_FALSE@AM_CPPFLAGS = -DSKALE_SGX=1 -DBINARY_OUTPUT=1 \
@SGX_ENABLED_FALSE@ -fno-builtin-memset $(GMP_CPPFLAGS) @SGX_ENABLED_FALSE@ -IlibBLS -Ilibff -fno-builtin-memset \
@SGX_ENABLED_FALSE@ $(GMP_CPPFLAGS)
@SGX_ENABLED_TRUE@AM_CPPFLAGS = -I$(SGXSDK_INCDIR) -DSKALE_SGX=1 \ @SGX_ENABLED_TRUE@AM_CPPFLAGS = -I$(SGXSDK_INCDIR) -DSKALE_SGX=1 \
@SGX_ENABLED_TRUE@ -IlibBLS -Ilibff -fno-builtin-memset \ @SGX_ENABLED_TRUE@ -DBINARY_OUTPUT=1 -IlibBLS -Ilibff \
@SGX_ENABLED_TRUE@ $(GMP_CPPFLAGS) @SGX_ENABLED_TRUE@ -fno-builtin-memset $(GMP_CPPFLAGS)
@SGX_ENABLED_FALSE@AM_LDFLAGS = $(GMP_LDFLAGS) @SGX_ENABLED_FALSE@AM_LDFLAGS = $(GMP_LDFLAGS)
@SGX_ENABLED_TRUE@AM_LDFLAGS = -L$(SGXSDK_LIBDIR) $(GMP_LDFLAGS) @SGX_ENABLED_TRUE@AM_LDFLAGS = -L$(SGXSDK_LIBDIR) $(GMP_LDFLAGS)
SUBDIRS = EnclaveGmpTest SUBDIRS = EnclaveGmpTest
......
...@@ -447,39 +447,3 @@ target_alias='' ...@@ -447,39 +447,3 @@ target_alias=''
#define DEBUG 1 #define DEBUG 1
configure: exit 0 configure: exit 0
## ---------------------- ##
## Running config.status. ##
## ---------------------- ##
This file was extended by SGX GMP Test config.status 1.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES =
CONFIG_HEADERS =
CONFIG_LINKS =
CONFIG_COMMANDS =
$ ./config.status Makefile depfiles
on skale-Lenovo-ideapad-520-15IKB
config.status:815: creating Makefile
config.status:987: executing depfiles commands
## ---------------------- ##
## Running config.status. ##
## ---------------------- ##
This file was extended by SGX GMP Test config.status 1.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES =
CONFIG_HEADERS =
CONFIG_LINKS =
CONFIG_COMMANDS =
$ ./config.status Makefile depfiles
on skale-Lenovo-ideapad-520-15IKB
config.status:815: creating Makefile
config.status:987: executing depfiles commands
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