From 6d786b0afa8d77310b8adb154f0a6cdb76dfe38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Tue, 1 Oct 2024 20:03:06 +0100
Subject: [PATCH] Stop throwing away make stderr output
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Calling '$(MAKE)' against a sub-directory, while redirecting the
stderr output to /dev/null makes it impossible to debug build
failures, as it hides all compiler error messages. Stop sending
output to /dev/null, so users can figure out what's wrong when
a new compiler release fails to build SGX.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 psw/ae/pve/Makefile | 2 +-
 psw/ae/qe/Makefile  | 2 +-
 sdk/Makefile.source | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/psw/ae/pve/Makefile b/psw/ae/pve/Makefile
index 3da3a43b2..eec50aa91 100644
--- a/psw/ae/pve/Makefile
+++ b/psw/ae/pve/Makefile
@@ -67,7 +67,7 @@ all: $(SONAME)
 .PHONY: EPID
 EPID:
 	cd $(EPID_SDK_DIR) && CFLAGS="$(EPID_CFLAGS)" CXXFLAGS="$(EPID_CXXFLAGS)" ./configure prefix=/usr/local
-	$(MAKE) -C $(EPID_SDK_DIR) 2> /dev/null
+	$(MAKE) -C $(EPID_SDK_DIR)
 
 $(SONAME): $(OBJS) EPID
 	$(CXX) $(CXXFLAGS) -o $@  $(OBJS)  -nostdlib -nodefaultlibs -nostartfiles -Wl,-soname=libsgx_$(AENAME).signed.so.$(call get_major_version,PVE_VERSION) $(LDTFLAGS)
diff --git a/psw/ae/qe/Makefile b/psw/ae/qe/Makefile
index e77219e9d..a55817d12 100644
--- a/psw/ae/qe/Makefile
+++ b/psw/ae/qe/Makefile
@@ -63,7 +63,7 @@ all: $(SONAME)
 .PHONY: EPID
 EPID:
 	cd $(EPID_SDK_DIR) && CFLAGS="$(EPID_CFLAGS)" CXXFLAGS="$(EPID_CXXFLAGS)" ./configure prefix=/usr/local
-	$(MAKE) -C $(EPID_SDK_DIR) 2> /dev/null
+	$(MAKE) -C $(EPID_SDK_DIR)
 
 $(SONAME): $(OBJS) EPID
 	$(CC) $(CFLAGS) -o $@ $(OBJS) -nostdlib -nodefaultlibs -nostartfiles -Wl,-soname=libsgx_$(AENAME).signed.so.$(call get_major_version,QE_VERSION) $(LDTFLAGS)
diff --git a/sdk/Makefile.source b/sdk/Makefile.source
index 4bbfd4f37..91bd537fc 100644
--- a/sdk/Makefile.source
+++ b/sdk/Makefile.source
@@ -78,7 +78,7 @@ tstdc: $(LIBTLIBC)
 
 ifndef SERVTD_ATTEST
 $(LIBTLIBC): tlibthread compiler-rt tsafecrt tsetjmp tmm_rsrv
-	$(MAKE) -C tlibc/ -j$(shell nproc) 2> /dev/null
+	$(MAKE) -C tlibc/ -j$(shell nproc)
 	@$(MKDIR) $(BUILD_DIR)/.compiler-rt $(BUILD_DIR)/.tlibthread $(BUILD_DIR)/.tsafecrt $(BUILD_DIR)/.tsetjmp $(BUILD_DIR)/.tmm_rsrv
 	@$(RM) -f $(BUILD_DIR)/.compiler-rt/*   && cd $(BUILD_DIR)/.compiler-rt && $(AR) x $(LINUX_SDK_DIR)/compiler-rt/libcompiler-rt.a
 	@$(RM) -f $(BUILD_DIR)/.tlibthread/*    && cd $(BUILD_DIR)/.tlibthread && $(AR) x $(LINUX_SDK_DIR)/tlibthread/libtlibthread.a
@@ -96,7 +96,7 @@ $(LIBTLIBC): tlibthread compiler-rt tsafecrt tsetjmp tmm_rsrv
 	@$(RM) -rf $(BUILD_DIR)/.tsetjmp $(BUILD_DIR)/.tmm_rsrv
 else
 $(LIBTLIBC): tlibthread tsafecrt tsetjmp tmm_rsrv
-	$(MAKE) -C tlibc/ SERVTD_ATTEST=1 -j$(shell nproc) 2> /dev/null
+	$(MAKE) -C tlibc/ SERVTD_ATTEST=1 -j$(shell nproc)
 	@$(MKDIR) $(BUILD_DIR)/.tlibthread $(BUILD_DIR)/.tsafecrt $(BUILD_DIR)/.tsetjmp  $(BUILD_DIR)/.tmm_rsrv
 	@$(RM) -f $(BUILD_DIR)/.tlibthread/*    && cd $(BUILD_DIR)/.tlibthread && $(AR) x $(LINUX_SDK_DIR)/tlibthread/libtlibthread.a
 	@$(RM) -f $(BUILD_DIR)/.tsafecrt/*      && cd $(BUILD_DIR)/.tsafecrt   && $(AR) x $(LINUX_SDK_DIR)/tsafecrt/libsgx_tsafecrt.a
@@ -119,7 +119,7 @@ tsafecrt:
 
 .PHONY: compiler-rt
 compiler-rt:
-	$(MAKE) -C compiler-rt/ 2> /dev/null
+	$(MAKE) -C compiler-rt/
 
 .PHONY: tsetjmp
 tsetjmp:
@@ -163,7 +163,7 @@ cpprt:
 
 .PHONY: tlibcxx
 tlibcxx: $(BUILD_DIR)
-	$(MAKE) -C tlibcxx/ 2> /dev/null
+	$(MAKE) -C tlibcxx/
 	$(CP) tlibcxx/README.sgx $(BUILD_DIR)/libc++_Changes_SGX.txt
 
 # ---------------------------------------------------