Merge mainline into cleanbuild

configure.ac

@@ -535,11 +535,11 @@ int va_arg_func (int fixed, va_list args);]], [[]])],
       [grub_cv_cc_isystem=no])
   CPPFLAGS="$SAVED_CPPFLAGS"
 ])
-endif
 
 if test x"$grub_cv_cc_isystem" = xyes ; then
   TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
 fi
+fi
 
 # Restore the flags.
 CC="$tmp_CC"