From: Johannes Sixt <j.sixt@viscovery.net>
To: Ted Ts'o <tytso@mit.edu>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] Fix build problems related to profile-directed optimization
Date: Thu, 09 Feb 2012 09:22:26 +0100 [thread overview]
Message-ID: <4F338242.8080907@viscovery.net> (raw)
In-Reply-To: <20120208185319.GB9397@thunk.org>
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.
--- >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);
--
1.7.9.1420.gae2d6
next prev parent reply other threads:[~2012-02-09 8:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-02 19:03 [PATCH, RFC] Fix build problems related to profile-directed optimization Theodore Ts'o
2012-02-02 20:02 ` Junio C Hamano
2012-02-02 20:12 ` Ted Ts'o
2012-02-02 20:14 ` Ted Ts'o
2012-02-03 0:58 ` Junio C Hamano
2012-02-03 2:07 ` Ted Ts'o
2012-02-03 6:00 ` Junio C Hamano
2012-02-03 18:19 ` Theodore Tso
2012-02-03 19:58 ` Junio C Hamano
2012-02-06 0:44 ` [PATCH] " Theodore Ts'o
2012-02-06 4:18 ` Jeff King
2012-02-06 5:57 ` Ted Ts'o
2012-02-06 6:00 ` Theodore Ts'o
2012-02-08 18:53 ` Ted Ts'o
2012-02-09 4:03 ` Junio C Hamano
2012-02-09 8:22 ` Johannes Sixt [this message]
2012-02-09 18:22 ` Junio C Hamano
2012-02-03 18:39 ` [PATCH, RFC] " Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F338242.8080907@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).