From ba24afc3a4611a864b7aa43e4f551dd17b8cef8b Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Wed, 12 Aug 2020 20:09:47 -0400
Subject: [PATCH] Bug 521515: Save the log file all the time when building
 natives

Change-Id: I11b149d94f837dcb9537682a55551add289f8924
---
 .gitignore                               | 1 +
 releng/scripts/check_code_cleanliness.sh | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a2267a1d9bf..d4ccc11b9cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ check_code_cleanliness_workspace/
 .META-INF_MANIFEST.MF
 .polyglot..META-INF_MANIFEST.MF
 *.takari_issue_192
+*.log
diff --git a/releng/scripts/check_code_cleanliness.sh b/releng/scripts/check_code_cleanliness.sh
index cd2408e32c0..09dcd2c66f4 100755
--- a/releng/scripts/check_code_cleanliness.sh
+++ b/releng/scripts/check_code_cleanliness.sh
@@ -107,10 +107,9 @@ done
 ##
 for p in native/org.eclipse.cdt.native.serial/native_src core/org.eclipse.cdt.core.native/native_src; do
     echo "Rebuilding $p natives to make sure they match source"
-    logfile=$(mktemp /tmp/make-natives-log.XXXXXX)
+    logfile=make-natives-${p//\//-}.log
     if ! make -C $p rebuild >${logfile} 2>&1; then
-        echo "Rebuilding of $p natives failed. The log is part of the artifacts of the build"
-        cp ${logfile} make-${p//\//_}.log
+        echo "Rebuilding of $p natives failed. The log (${logfile}) is part of the artifacts of the build"
         exit 1
     fi
 done