--- a/make/common/NativeCompilation.gmk	Mon Mar 05 22:35:26 2018 +0100
+++ b/make/common/NativeCompilation.gmk	Mon Mar 05 22:35:54 2018 +0100
@@ -320,9 +320,9 @@
           # Windows.
 	  $$(call ExecuteWithLog, $$@, \
 	      $$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
-	          $(CC_OUT_OPTION)$$($1_$2_OBJ) $2) \
+	          $(CC_OUT_OPTION)$$($1_$2_OBJ) $2) 2>&1 \
 	      | $(GREP) -v -e "^Note: including file:" \
-	          -e "^$(notdir $2)$$$$" || test "$$$$?" = "1" ; \
+	          -e "^$(notdir $2)" || test "$$$$?" = "1" ; \
 	  $(ECHO) $$@: \\ > $$($1_$2_DEP) ; \
 	  $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_$2_OBJ).log \
 	      | $(SORT) -u >> $$($1_$2_DEP) ; \