Revert "Fix sgx_epid linking issue"

This reverts commit c059de1.

Makefile

@@ -148,12 +148,6 @@ GO_TAGS := $(build_tags)
 # -ldflags
 LD_FLAGS := $(ldflags)
 
-ifeq ($(SGX_MODE), HW)
-  CGO_LDFLAGS += -lsgx_epid
-else
-  CGO_LDFLAGS += -lsgx_epid_sim
-endif
-
 all: build_all
 
 go.sum: go.mod
@@ -162,11 +156,11 @@ go.sum: go.mod
 
 # Build the CLI tool
 build_cli:
-	CGO_LDFLAGS=$(CGO_LDFLAGS) go build -o secretcli -mod=readonly $(GCFLAGS) -tags "$(filter-out sgx, $(GO_TAGS)) secretcli" -ldflags '$(LD_FLAGS)' ./cmd/secretd
+	go build -o secretcli -mod=readonly $(GCFLAGS) -tags "$(filter-out sgx, $(GO_TAGS)) secretcli" -ldflags '$(LD_FLAGS)' ./cmd/secretd
 
 build_local_no_rust: bin-data-$(IAS_BUILD)
 	cp go-cosmwasm/target/$(BUILD_PROFILE)/libgo_cosmwasm.so go-cosmwasm/api
-	CGO_LDFLAGS=$(CGO_LDFLAGS) go build -mod=readonly $(GCFLAGS) -tags "$(GO_TAGS)" -ldflags '$(LD_FLAGS)' ./cmd/secretd
+	go build -mod=readonly $(GCFLAGS) -tags "$(GO_TAGS)" -ldflags '$(LD_FLAGS)' ./cmd/secretd
 
 build-secret: build-linux
 

go-cosmwasm/api/link_std.go

@@ -3,5 +3,5 @@
 
 package api
 
-// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lgo_cosmwasm -lsgx_dcap_ql -lsgx_dcap_quoteverify
+// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lgo_cosmwasm -lsgx_dcap_ql -lsgx_dcap_quoteverify -lsgx_epid
 import "C"