diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-10-17 14:02:14 -0400 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2015-02-06 18:27:55 -0500 |
| commit | 640080a7c47238f0b63e35cfb484308f76db4992 (patch) | |
| tree | cfc67f77ebd4f079345e6897ca845a98c2260171 | |
| parent | e92e44604fcaa78e2bd117c51286d9c9f4367483 (diff) | |
| download | krb5-640080a7c47238f0b63e35cfb484308f76db4992.zip krb5-640080a7c47238f0b63e35cfb484308f76db4992.tar.gz krb5-640080a7c47238f0b63e35cfb484308f76db4992.tar.bz2 | |
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.
(cherry picked from commit 4d3827ac1b0e9e6447a132c57f3e2d74d3dfe8a9)
ticket: 8111 (new)
version_fixed: 1.11.6
status: resolved
| -rw-r--r-- | src/util/profile/Makefile.in | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in index e88094e..f02eae1 100644 --- a/src/util/profile/Makefile.in +++ b/src/util/profile/Makefile.in @@ -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 |