diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2014-12-20 13:26:48 -0800 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2014-12-20 13:29:45 -0800 |
| commit | e26e8c58799c2b179940b83e1ab4f376a132774d (patch) | |
| tree | f6764615e51a259a20f3749a2466e5ee037dfec6 /Makefile.in | |
| parent | 327a66f990e13a9fe0477e5a0a0a708681f6346f (diff) | |
| download | spike-e26e8c58799c2b179940b83e1ab4f376a132774d.zip spike-e26e8c58799c2b179940b83e1ab4f376a132774d.tar.gz spike-e26e8c58799c2b179940b83e1ab4f376a132774d.tar.bz2 | |
Fix makefile race condition
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 2445f94..dcecc23 100644 --- a/Makefile.in +++ b/Makefile.in @@ -189,6 +189,7 @@ $(2)_objs := $$(patsubst %.cc, %.o, $$($(2)_srcs)) $(2)_c_objs := $$(patsubst %.c, %.o, $$($(2)_c_srcs)) $(2)_deps := $$(patsubst %.o, %.d, $$($(2)_objs)) $(2)_c_deps := $$(patsubst %.o, %.d, $$($(2)_c_objs)) +$(2)_pch_deps := $$(patsubst %.h, %.d, $$($(2)_precompiled_hdrs)) $$($(2)_pch) : %.h.gch : %.h $$($(2)_gen_hdrs) $(COMPILE) $$< # If using clang, don't depend (and thus don't build) precompiled headers @@ -198,7 +199,7 @@ $$($(2)_c_objs) : %.o : %.c $$($(2)_gen_hdrs) $(COMPILE_C) -c $$< $(2)_junk += $$(addprefix $(src_dir)/$(1)/, $$($(2)_pch)) \ - $$($(2)_objs) $$($(2)_c_objs) $$($(2)_deps) $$($(2)_c_deps) $$($(2)_gen_hdrs) + $$($(2)_objs) $$($(2)_c_objs) $$($(2)_deps) $$($(2)_c_deps) $$($(2)_gen_hdrs) $$($(2)_pch_deps) # Reverse the dependency list so that a given subproject only depends on # subprojects listed to its right. This is the correct order for linking |