Re: [PATCH] Fix build problems related to profile-directed optimization

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 9, 2012, 18:22 UTC
Message-ID: <7vr4y3x3wx.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4F338242.8080907@viscovery.net>

Johannes Sixt <j.sixt@viscovery.net> writes:

Show 5 quoted lines

> Am 2/8/2012 19:53, schrieb Ted Ts'o:
>> Junio, any comments on my most recent spin of this patch?  Any changes
>> you'd like to see?
>
> I need the following to unbreak my build on Windows.

Thanks; will apply.

Show 37 quoted lines

> --- >8 ---
> From: Johannes Sixt <j6t@kdbg.org>
> Subject: [PATCH] Makefile: fix syntax for older make
>
> It is necessary to write the else branch as a nested conditional. Also,
> write the conditions with parentheses because we use them throughout the
> Makefile.
>
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
>  Makefile |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index bfc5daa..01a3c77 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1784,16 +1784,18 @@ endif
>  # data gathering
>  PROFILE_DIR := $(CURDIR)
>  
> -ifeq "$(PROFILE)" "GEN"
> +ifeq ("$(PROFILE)","GEN")
>  	CFLAGS += -fprofile-generate=$(PROFILE_DIR) -DNO_NORETURN=1
>  	EXTLIBS += -lgcov
>  	export CCACHE_DISABLE=t
>  	V=1
> -else ifneq "$(PROFILE)" ""
> +else
> +ifneq ("$(PROFILE)","")
>  	CFLAGS += -fprofile-use=$(PROFILE_DIR) -fprofile-correction -DNO_NORETURN=1
>  	export CCACHE_DISABLE=t
>  	V=1
>  endif
> +endif
>  
>  # Shell quote (do not use $(call) to accommodate ancient setups);