(Urgent) RFR JDK-8033115 Bad merge between 8027584 and 8031759
Mike Duigou
mike.duigou at oracle.com
Fri Jan 31 18:52:58 UTC 2014
Looks fine.
On Jan 29 2014, at 03:13 , Magnus Ihse Bursie <magnus.ihse.bursie at oracle.com> wrote:
> Bug: https://bugs.openjdk.java.net/browse/JDK-8033115
>
> Due to a bad merge between 8027584 and 8031759, configure fails.
>
> The merge auto-applied, so I didn't think there would be any problems. But there was a missing S, causing configure to always fail. :-(
>
> Here's the patch:
>
> --- a/common/autoconf/build-performance.m4
> +++ b/common/autoconf/build-performance.m4
> @@ -172,7 +172,7 @@
> if test "x$TOOLS_DIR" != x; then
> PATH=$TOOLS_DIR:$PATH
> fi
> - BASIC_REQUIRE_PROG(CCACHE, ccache)
> + BASIC_REQUIRE_PROGS(CCACHE, ccache)
> CCACHE_STATUS="enabled"
> PATH="$OLD_PATH"
> elif test "x$enable_ccache" = xno; then
>
>
> /Magnus
>
More information about the build-dev
mailing list