Skip to content

Commit

Permalink
Fix race in util/profile/Makefile.in
Browse files Browse the repository at this point in the history
$(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.

(cherry picked from commit 4d3827a)

ticket: 8111 (new)
version_fixed: 1.11.6
status: resolved
  • Loading branch information
greghudson authored and tlyu committed Feb 6, 2015
1 parent e92e446 commit 640080a
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/util/profile/Makefile.in
Expand Up @@ -68,13 +68,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
Expand Down

0 comments on commit 640080a

Please sign in to comment.