Skip to content

Commit 2e5be11

Browse files
berrangeberrange
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 72c70d6 commit 2e5be11

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
@@ -138,9 +138,9 @@ PREPARE_SGXSSL := ../prepare_sgxssl.sh
138138
SGXSSL_HEADER_CHECK := $(SGXSSL_PACKAGE_PATH)/include/openssl/opensslconf.h
139139
PREPARE_SGX_SSL:
140140
ifdef SERVTD_ATTEST
141-
@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
141+
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
142142
else
143-
@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) $(if $(FIPS),FIPS)
143+
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) $(if $(FIPS),FIPS)
144144
endif
145145

146146
$(SGXSSL_HEADER_CHECK): PREPARE_SGX_SSL
@@ -152,23 +152,23 @@ install_lib: $(SIGNED_QVE_NAME) | $(BUILD_DIR)
152152

153153
ifndef SERVTD_ATTEST
154154
Enclave/sgx_base64.o: $(DCAP_QPL_DIR)/sgx_base64.cpp
155-
@$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
155+
$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
156156
@echo "CXX <= $<"
157157
Enclave/ec_key.o: $(DCAP_QV_DIR)/appraisal/common/ec_key.cpp
158-
@$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
158+
$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
159159
@echo "CXX <= $<"
160160
endif
161161

162162
$(QVL_LIB_OBJS): %.o: %.cpp $(SGXSSL_HEADER_CHECK)
163163
ifdef SERVTD_ATTEST
164-
@$(CXX) -DSERVTD_ATTEST $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
164+
$(CXX) -DSERVTD_ATTEST $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
165165
else
166-
@$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
166+
$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_LIB_INC) -c $< -o $@
167167
endif
168168
@echo "CXX <= $<"
169169

170170
$(QVL_PARSER_OBJS): %.o: %.cpp $(SGXSSL_HEADER_CHECK)
171-
@$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_PARSER_INC) -c $< -o $@
171+
$(CXX) $(ENCLAVE_CXXFLAGS) $(QVL_PARSER_INC) -c $< -o $@
172172
@echo "CXX <= $<"
173173

174174
ifndef SERVTD_ATTEST
@@ -179,7 +179,7 @@ Enclave/qve_t.h: Enclave/qve.edl $(SGX_EDGER8R)
179179
Enclave/qve_t.c: Enclave/qve_t.h
180180

181181
Enclave/qve_t.o: Enclave/qve_t.c
182-
@$(CC) $(SGX_COMMON_CFLAGS) $(ENCLAVE_CFLAGS) -c $< -o $@
182+
$(CC) $(SGX_COMMON_CFLAGS) $(ENCLAVE_CFLAGS) -c $< -o $@
183183
@echo "CC <= $<"
184184
endif
185185

@@ -188,7 +188,7 @@ Enclave/%.o: Enclave/%.cpp $(SGXSSL_HEADER_CHECK)
188188
else
189189
Enclave/%.o: Enclave/%.cpp Enclave/qve_t.h $(SGXSSL_HEADER_CHECK)
190190
endif
191-
@$(CXX) $(SGX_COMMON_CXXFLAGS) $(ENCLAVE_CXXFLAGS) $(if $(FIPS),-DSGXSSL_FIPS) $(QVL_LIB_INC) -I$(QVL_SRC_PATH) -c $< -o $@
191+
$(CXX) $(SGX_COMMON_CXXFLAGS) $(ENCLAVE_CXXFLAGS) $(if $(FIPS),-DSGXSSL_FIPS) $(QVL_LIB_INC) -I$(QVL_SRC_PATH) -c $< -o $@
192192
@echo "CXX <= $<"
193193

194194
ifdef SERVTD_ATTEST
@@ -209,16 +209,16 @@ endif
209209
ifdef SERVTD_ATTEST
210210
$(QVE_NAME): $(QVE_OBJS) $(QVL_PARSER_OBJS) $(QVL_LIB_OBJS)
211211
if [ ! -d "$(SERVTD_ATTEST_BUILD_DIR)" ]; then mkdir -p '$(SERVTD_ATTEST_BUILD_DIR)';fi
212-
@$(CXX) $^ -shared -o $(SERVTD_ATTEST_BUILD_DIR)/$@ $(ENCLAVE_LDFLAGS) $(ENCLAVE_CXXFLAGS)
212+
$(CXX) $^ -shared -o $(SERVTD_ATTEST_BUILD_DIR)/$@ $(ENCLAVE_LDFLAGS) $(ENCLAVE_CXXFLAGS)
213213
else
214214
$(QVE_NAME): $(QVE_OBJS) Enclave/qve_t.o $(QVL_PARSER_OBJS) $(QVL_LIB_OBJS) $(QVL_LIB_COMMON_OBJS)
215-
@$(CXX) $^ -o $@ $(ENCLAVE_LDFLAGS) $(ENCLAVE_CXXFLAGS) -Wl,-soname=${SIGNED_QVE_NAME}.$(call get_major_version,QVE_VERSION)
215+
$(CXX) $^ -o $@ $(ENCLAVE_LDFLAGS) $(ENCLAVE_CXXFLAGS) -Wl,-soname=${SIGNED_QVE_NAME}.$(call get_major_version,QVE_VERSION)
216216
$(STRIP) --strip-unneeded --remove-section=.comment --remove-section=.note $@
217217
endif
218218
@echo "LINK => $@"
219219

220220
$(SIGNED_QVE_NAME): $(QVE_NAME) $(QVE_CONFIG_FILE)
221-
@$(SGX_ENCLAVE_SIGNER) sign -key Enclave/qve_test_key.pem -enclave $< -out $@ -config $(QVE_CONFIG_FILE)
221+
$(SGX_ENCLAVE_SIGNER) sign -key Enclave/qve_test_key.pem -enclave $< -out $@ -config $(QVE_CONFIG_FILE)
222222
@echo "SIGN => $@"
223223

224224
print-% : ; @echo $* = $($*)
@@ -227,13 +227,13 @@ print-% : ; @echo $* = $($*)
227227

228228
clean:
229229
@echo "Cleaning objects"
230-
@rm -rf $(QVL_PARSER_OBJS) $(QVL_LIB_OBJS) $(QVL_LIB_COMMON_OBJS)
231-
@rm -f .config_* $(QVE_NAME) $(SIGNED_QVE_NAME) Enclave/str_to_time.o Enclave/bionic_localtime.o $(QVE_OBJS) Enclave/qve_t.* Enclave/*.d
232-
@rm -f *.map
233-
@rm -f $(SERVTD_ATTEST_BUILD_DIR)/$(QVE_NAME)
234-
@rm -f $(BUILD_DIR)/$(SIGNED_QVE_NAME)
235-
@$(MAKE) -C Test clean
230+
rm -rf $(QVL_PARSER_OBJS) $(QVL_LIB_OBJS) $(QVL_LIB_COMMON_OBJS)
231+
rm -f .config_* $(QVE_NAME) $(SIGNED_QVE_NAME) Enclave/str_to_time.o Enclave/bionic_localtime.o $(QVE_OBJS) Enclave/qve_t.* Enclave/*.d
232+
rm -f *.map
233+
rm -f $(SERVTD_ATTEST_BUILD_DIR)/$(QVE_NAME)
234+
rm -f $(BUILD_DIR)/$(SIGNED_QVE_NAME)
235+
$(MAKE) -C Test clean
236236

237237
SGXSSL_clean:
238238
@echo "Cleaning sgxssl"
239-
@rm -rf ../sgxssl/
239+
rm -rf ../sgxssl/

0 commit comments

Comments
 (0)