From 4d3827ac1b0e9e6447a132c57f3e2d74d3dfe8a9 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Thu, 17 Oct 2013 14:02:14 -0400 Subject: [PATCH] Fix race in util/profile/Makefile.in $(BUILDTOP)/include/profile.h was being updated by two different rules, which could collide with make -j. Use a dependency from includes instead of a redundant rule. --- src/util/profile/Makefile.in | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in index f1418fb7fe..79ea610c5b 100644 --- a/src/util/profile/Makefile.in +++ b/src/util/profile/Makefile.in @@ -62,13 +62,7 @@ generate-files-mac: profile.h $(PROFILE_HDR):: profile.h $(CP) profile.h "$@" -includes:: profile.h - if cmp profile.h \ - $(BUILDTOP)/include/profile.h >/dev/null 2>&1; then :; \ - else \ - (set -x; $(RM) $(BUILDTOP)/include/profile.h; \ - $(CP) profile.h $(BUILDTOP)/include/profile.h) ; \ - fi +includes:: $(PROFILE_HDR) clean-unix:: $(RM) $(BUILDTOP)/include/profile.h test2.ini test3.ini test2.ini.bak -- 2.47.2