diff --git a/compiler-rt/lib/sanitizer_common/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/CMakeLists.txt
index 12e44ffe944b..e9d58652aafd 100644
--- a/compiler-rt/lib/sanitizer_common/CMakeLists.txt
+++ b/compiler-rt/lib/sanitizer_common/CMakeLists.txt
@@ -104,7 +104,8 @@ endif()
 if(UNIX)
   set(SANITIZER_LINT_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/scripts/check_lint.sh)
   add_custom_target(SanitizerLintCheck ALL
-    COMMAND LLVM_CHECKOUT=${LLVM_MAIN_SRC_DIR} SILENT=1 ${SANITIZER_LINT_SCRIPT}
+    COMMAND LLVM_CHECKOUT=${LLVM_MAIN_SRC_DIR} SILENT=1 TMPDIR=
+      ${SANITIZER_LINT_SCRIPT}
     DEPENDS ${SANITIZER_LINT_SCRIPT}
     COMMENT "Running lint check for sanitizer sources..."
     VERBATIM)
diff --git a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
index 7269425d0883..df4871b8a005 100755
--- a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
+++ b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
@@ -31,12 +31,12 @@ SANITIZER_INCLUDES_LINT_FILTER=${COMMON_LINT_FILTER},-runtime/int
 cd ${LLVM_CHECKOUT}
 
 EXITSTATUS=0
-LOG=$(mktemp)
+LOG=$(mktemp -q)
 
 run_lint() {
   FILTER=$1
   shift
-  if [ "${SILENT}" == "1" ]; then
+  if [[ "${SILENT}" == "1" && "${LOG}" != "" ]]; then
     ${CPPLINT} --filter=${FILTER} "$@" 2>>$LOG
   else
     ${CPPLINT} --filter=${FILTER} "$@"
@@ -97,7 +97,8 @@ for FILE in $FILES; do
 done
 
 if [ "$EXITSTATUS" != "0" ]; then
-  cat $LOG | grep -v "Done processing" | grep -v "Total errors found"
+  cat $LOG | grep -v "Done processing" | grep -v "Total errors found" \
+    grep -v "Skipping input"
 fi
 
 exit $EXITSTATUS