From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Aug 2013 20:36:33 +0000 (-0700)
Subject: Meta/Make: prepend the canned settings to $O
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc3b7dec98546f4b2950272d73c18becae44b571;p=thirdparty%2Fgit.git

Meta/Make: prepend the canned settings to $O

Otherwise "O=<some custom settings> Meta/Make" will not be able to
override them.
---

diff --git a/Make b/Make
index 0e40505817..ee4f266851 100755
--- a/Make
+++ b/Make
@@ -113,9 +113,9 @@ do
 		case "$NO_PEDANTIC" in
 		?*)	;;
 		'')
-			O="$O -Werror $(old_style_def_fix) -std=c99"
-			O="$O -Wno-pointer-to-int-cast"
-			O="$O -Wpointer-arith -Woverflow -Wunused"
+			O="-Werror $(old_style_def_fix) -std=c99 $O"
+			O="-Wno-pointer-to-int-cast $O"
+			O="-Wpointer-arith -Woverflow -Wunused $O"
 			;;
 		esac
 		# -Wvla