# HG changeset patch
# User erikj
# Date 1371209414 -7200
# Node ID ea4d5096e411c774c8fcee118efdcd6119dba6ad
# Parent  d9d70190de37340c6dc4f495bde1e77e427edf0c
8016520: jdk native build does not fail on compilation error on windows
Reviewed-by: tbell

diff -r d9d70190de37 -r ea4d5096e411 common/makefiles/NativeCompilation.gmk
--- a/common/makefiles/NativeCompilation.gmk	Thu Jun 13 14:04:32 2013 +0200
+++ b/common/makefiles/NativeCompilation.gmk	Fri Jun 14 13:30:14 2013 +0200
@@ -108,7 +108,11 @@
         # setting -showIncludes, all included files are printed. These are filtered out and 
         # parsed into make dependences.
         ifeq ($(COMPILER_TYPE),CL)
-		$$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 | $(TEE) $$($1_$2_DEP).raw | $(GREP) -v "^Note: including file:"
+		($$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
+			$(CC_OUT_OPTION)$$($1_$2_OBJ) $2 ; echo $$$$? > $$($1_$2_DEP).exitvalue) \
+			| $(TEE) $$($1_$2_DEP).raw | $(GREP) -v "^Note: including file:" \
+			&& exit `cat $$($1_$2_DEP).exitvalue`
+		$(RM) $$($1_$2_DEP).exitvalue
 		($(ECHO) $$@: \\ \
 		 && $(SED) -e '/^Note: including file:/!d' \
 			-e 's|Note: including file: *||' \