# HG changeset patch # User henryjen # Date 1390363634 28800 # Node ID f3b88f05c52866ace2c7fce735abbb0d305eda13 # Parent fe165bf76695f85cd4e278775e4e9a4a0448c1fc 8028407: adjust-mflags.sh failed build with GNU Make 4.0 with -I Reviewed-by: erikj diff -r fe165bf76695 -r f3b88f05c528 hotspot/make/bsd/makefiles/adjust-mflags.sh --- a/hotspot/make/bsd/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800 +++ b/hotspot/make/bsd/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800 @@ -64,7 +64,7 @@ echo "$MFLAGS" \ | sed ' s/^-/ -/ - s/ -\([^ ][^ ]*\)j/ -\1 -j/ + s/ -\([^ I][^ I]*\)j/ -\1 -j/ s/ -j[0-9][0-9]*/ -j/ s/ -j\([^ ]\)/ -j -\1/ s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/ diff -r fe165bf76695 -r f3b88f05c528 hotspot/make/linux/makefiles/adjust-mflags.sh --- a/hotspot/make/linux/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800 +++ b/hotspot/make/linux/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800 @@ -64,7 +64,7 @@ echo "$MFLAGS" \ | sed ' s/^-/ -/ - s/ -\([^ ][^ ]*\)j/ -\1 -j/ + s/ -\([^ I][^ I]*\)j/ -\1 -j/ s/ -j[0-9][0-9]*/ -j/ s/ -j\([^ ]\)/ -j -\1/ s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/ diff -r fe165bf76695 -r f3b88f05c528 hotspot/make/solaris/makefiles/adjust-mflags.sh --- a/hotspot/make/solaris/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800 +++ b/hotspot/make/solaris/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800 @@ -64,7 +64,7 @@ echo "$MFLAGS" \ | sed ' s/^-/ -/ - s/ -\([^ ][^ ]*\)j/ -\1 -j/ + s/ -\([^ I][^ I]*\)j/ -\1 -j/ s/ -j[0-9][0-9]*/ -j/ s/ -j\([^ ]\)/ -j -\1/ s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/