Skip to content

Commit 2e43282

Browse files
committed
Don't hide QvE build commands
Having the full compiler commands visible in make output is critical to diagnose build failures / reproducibility problems. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
1 parent 2562057 commit 2e43282

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

QuoteVerification/QvE/Makefile

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ PREPARE_SGXSSL := ../prepare_sgxssl.sh
160160
SGXSSL_HEADER_CHECK := $(SGXSSL_PACKAGE_PATH)/include/openssl/opensslconf.h
161161
PREPARE_SGX_SSL:
162162
ifdef SERVTD_ATTEST
163-
@test -f $(SGXSSL_PACKAGE_PATH)/lib64/lib$(SGXSSL_TCRYPTO).a && test -f $(SGXSSL_PACKAGE_PATH)/lib64/lib$(SGXSSL_TLIB).a && test -f $(SGXSSL_HEADER_CHECK) || $(PREPARE_SGXSSL) SERVTD_ATTEST
163+
test -f $(SGXSSL_PACKAGE_PATH)/lib64/lib$(SGXSSL_TCRYPTO).a && test -f $(SGXSSL_PACKAGE_PATH)/lib64/lib$(SGXSSL_TLIB).a && test -f $(SGXSSL_HEADER_CHECK) || $(PREPARE_SGXSSL) SERVTD_ATTEST
164164
else
165-
@test -f $(SGXSSL_PACKAGE_PATH)/lib64/lib$(SGXSSL_TCRYPTO).a && test -f $(SGXSSL_PACKAGE_PATH)/lib64/lib$(SGXSSL_TLIB).a && test -f $(SGXSSL_HEADER_CHECK) || $(PREPARE_SGXSSL)
165+
test -f $(SGXSSL_PACKAGE_PATH)/lib64/lib$(SGXSSL_TCRYPTO).a && test -f $(SGXSSL_PACKAGE_PATH)/lib64/lib$(SGXSSL_TLIB).a && test -f $(SGXSSL_HEADER_CHECK) || $(PREPARE_SGXSSL)
166166
endif
167167

168168
$(SGXSSL_HEADER_CHECK): PREPARE_SGX_SSL
@@ -174,34 +174,34 @@ install_lib: $(SIGNED_QVE_NAME) | $(BUILD_DIR)
174174

175175
ifndef SERVTD_ATTEST
176176
Enclave/sgx_base64.o: $(DCAP_QPL_DIR)/sgx_base64.cpp
177-
@$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
177+
$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
178178
@echo "CXX <= $<"
179179
Enclave/ec_key.o: $(DCAP_QV_DIR)/appraisal/common/ec_key.cpp
180-
@$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
180+
$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
181181
@echo "CXX <= $<"
182182
endif
183183

184184
$(QVL_LIB_OBJS): %.o: %.cpp $(SGXSSL_HEADER_CHECK)
185185
ifdef SERVTD_ATTEST
186-
@$(CXX) -DSERVTD_ATTEST $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
186+
$(CXX) -DSERVTD_ATTEST $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
187187
else
188-
@$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
188+
$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
189189
endif
190190
@echo "CXX <= $<"
191191

192192
$(QVL_PARSER_OBJS): %.o: %.cpp $(SGXSSL_HEADER_CHECK)
193-
@$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_PARSER_INC) -c $< -o $@
193+
$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_PARSER_INC) -c $< -o $@
194194
@echo "CXX <= $<"
195195

196196
ifndef SERVTD_ATTEST
197197
Enclave/qve_t.h: $(SGX_EDGER8R) Enclave/qve.edl
198-
@cd Enclave && $(SGX_EDGER8R) --trusted ../Enclave/qve.edl --search-path ../Enclave --search-path $(SGX_SDK)/include
198+
cd Enclave && $(SGX_EDGER8R) --trusted ../Enclave/qve.edl --search-path ../Enclave --search-path $(SGX_SDK)/include
199199
@echo "GEN => $@"
200200

201201
Enclave/qve_t.c: Enclave/qve_t.h
202202

203203
Enclave/qve_t.o: Enclave/qve_t.c
204-
@$(CC) $(SGX_COMMON_CFLAGS) $(ENCLAVE_CFLAGS) -c $< -o $@
204+
$(CC) $(SGX_COMMON_CFLAGS) $(ENCLAVE_CFLAGS) -c $< -o $@
205205
@echo "CC <= $<"
206206
endif
207207

@@ -210,7 +210,7 @@ Enclave/%.o: Enclave/%.cpp $(SGXSSL_HEADER_CHECK)
210210
else
211211
Enclave/%.o: Enclave/%.cpp Enclave/qve_t.h $(SGXSSL_HEADER_CHECK)
212212
endif
213-
@$(CXX) $(SGX_COMMON_CXXFLAGS) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -I$(QVL_SRC_PATH) -c $< -o $@
213+
$(CXX) $(SGX_COMMON_CXXFLAGS) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -I$(QVL_SRC_PATH) -c $< -o $@
214214
@echo "CXX <= $<"
215215

216216
ifdef SERVTD_ATTEST
@@ -231,16 +231,16 @@ endif
231231
ifdef SERVTD_ATTEST
232232
$(QVE_NAME): $(QVE_OBJS) $(QVL_PARSER_OBJS) $(QVL_LIB_OBJS)
233233
if [ ! -d "$(SERVTD_ATTEST_BUILD_DIR)" ]; then mkdir -p '$(SERVTD_ATTEST_BUILD_DIR)';fi
234-
@$(CXX) $^ -shared -o $(SERVTD_ATTEST_BUILD_DIR)/$@ $(ENCLAVE_LDFLAGS) $(ENCLAVE_CXXFLAGS)
234+
$(CXX) $^ -shared -o $(SERVTD_ATTEST_BUILD_DIR)/$@ $(ENCLAVE_LDFLAGS) $(ENCLAVE_CXXFLAGS)
235235
else
236236
$(QVE_NAME): $(QVE_OBJS) Enclave/qve_t.o $(QVL_PARSER_OBJS) $(QVL_LIB_OBJS) $(QVL_LIB_COMMON_OBJS)
237-
@$(CXX) $^ -o $@ $(ENCLAVE_LDFLAGS) $(ENCLAVE_CXXFLAGS) -Wl,-soname=${SIGNED_QVE_NAME}.$(call get_major_version,QVE_VERSION)
237+
$(CXX) $^ -o $@ $(ENCLAVE_LDFLAGS) $(ENCLAVE_CXXFLAGS) -Wl,-soname=${SIGNED_QVE_NAME}.$(call get_major_version,QVE_VERSION)
238238
$(STRIP) --strip-unneeded --remove-section=.comment --remove-section=.note $@
239239
endif
240240
@echo "LINK => $@"
241241

242242
$(SIGNED_QVE_NAME): $(QVE_NAME)
243-
@$(SGX_ENCLAVE_SIGNER) sign -key Enclave/qve_test_key.pem -enclave $(QVE_NAME) -out $@ -config $(QVE_CONFIG_FILE)
243+
$(SGX_ENCLAVE_SIGNER) sign -key Enclave/qve_test_key.pem -enclave $(QVE_NAME) -out $@ -config $(QVE_CONFIG_FILE)
244244
@echo "SIGN => $@"
245245

246246
print-% : ; @echo $* = $($*)
@@ -249,12 +249,12 @@ print-% : ; @echo $* = $($*)
249249

250250
clean:
251251
@echo "Cleaning objects"
252-
@rm -rf $(QVL_PARSER_OBJS) $(QVL_LIB_OBJS) $(QVL_LIB_COMMON_OBJS)
253-
@rm -f .config_* $(QVE_NAME) $(SIGNED_QVE_NAME) Enclave/str_to_time.o Enclave/bionic_localtime.o $(QVE_OBJS) Enclave/qve_t.* Enclave/*.d
254-
@rm -f *.map
255-
@rm -f $(SERVTD_ATTEST_BUILD_DIR)/$(QVE_NAME)
256-
@rm -f $(BUILD_DIR)/$(SIGNED_QVE_NAME)
252+
rm -rf $(QVL_PARSER_OBJS) $(QVL_LIB_OBJS) $(QVL_LIB_COMMON_OBJS)
253+
rm -f .config_* $(QVE_NAME) $(SIGNED_QVE_NAME) Enclave/str_to_time.o Enclave/bionic_localtime.o $(QVE_OBJS) Enclave/qve_t.* Enclave/*.d
254+
rm -f *.map
255+
rm -f $(SERVTD_ATTEST_BUILD_DIR)/$(QVE_NAME)
256+
rm -f $(BUILD_DIR)/$(SIGNED_QVE_NAME)
257257

258258
SGXSSL_clean:
259259
@echo "Cleaning sgxssl"
260-
@rm -rf ../sgxssl/
260+
rm -rf ../sgxssl/

0 commit comments

Comments
 (0)