This is an automated email from the ASF dual-hosted git repository.
dingyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-sgx-sdk.git
The following commit(s) were added to refs/heads/master by this push:
new 0539df9 Fix tcmalloc Makefile
new 4596820 Merge pull request #230 from volcano0dr/master
0539df9 is described below
commit 0539df9495c9ec2bbc0b8a410467c5d5c73ce917
Author: volcano <[email protected]>
AuthorDate: Fri Apr 24 15:30:55 2020 +0800
Fix tcmalloc Makefile
Fix make TCMALLOC=1 link error
---
samplecode/tcmalloc/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/samplecode/tcmalloc/Makefile b/samplecode/tcmalloc/Makefile
index 851b092..d323dd1 100644
--- a/samplecode/tcmalloc/Makefile
+++ b/samplecode/tcmalloc/Makefile
@@ -106,7 +106,7 @@ RustEnclave_Link_Libs := -L$(CUSTOM_LIBRARY_PATH) -lenclave
RustEnclave_Compile_Flags := $(SGX_COMMON_CFLAGS) $(ENCLAVE_CFLAGS)
$(RustEnclave_Include_Paths)
RustEnclave_Link_Flags := -Wl,--no-undefined -nostdlib -nodefaultlibs
-nostartfiles -L$(SGX_LIBRARY_PATH) \
-Wl,--whole-archive $(Tcmalloc_Flag) -l$(Trts_Library_Name)
-Wl,--no-whole-archive \
- -Wl,--start-group -lsgx_tstdc -l$(Service_Library_Name)
-l$(Crypto_Library_Name) $(RustEnclave_Link_Libs) -Wl,--end-group \
+ -Wl,--start-group -lsgx_tstdc -lsgx_tcxx -l$(Service_Library_Name)
-l$(Crypto_Library_Name) $(RustEnclave_Link_Libs) -Wl,--end-group \
-Wl,--version-script=enclave/Enclave.lds \
$(ENCLAVE_LDFLAGS)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
