]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Make: prepend the canned settings to $O
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Aug 2013 20:36:33 +0000 (13:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Aug 2013 20:36:33 +0000 (13:36 -0700)
Otherwise "O=<some custom settings> Meta/Make" will not be able to
override them.

Make

diff --git a/Make b/Make
index 0e40505817e64e7b55000fe3c0110f94ed13733e..ee4f266851f2052b12de38338e2b9f080181736b 100755 (executable)
--- 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