@@ -32,7 +32,7 @@ DISTCC_DIRS=target/cross-distcc/bin target/cross-distccd/bin target/native-distc #gcc_or_glibc = $(shell $(GUB) -p $(1) --inspect=version glibc > /dev/null 2>/dev/null && echo glibc || echo cross/gcc) gcc_or_glibc = $(shell if echo $(1) | grep linux > /dev/null 2>/dev/null; then echo glibc; else echo cross/gcc; fi) -tools = $(shell $(GUB) --dependencies $(foreach p, $(PLATFORMS), $(p)::$(call gcc_or_glibc,$(p))) 2>&1 | grep ^dependencies | tr ' ' '\n' | grep 'tools::') +tools = $(shell $(GUB) --show-dependencies $(foreach p, $(PLATFORMS), $(p)::$(call gcc_or_glibc,$(p))) 2>&1 | grep ^dependencies | tr ' ' '\n' | grep 'tools::') compilers: cross-compilers compilers.make @@ -142,7 +142,10 @@ realclean: ################################################################ # compilers and tools -tools := $(shell $(GUB) --dependencies $(foreach p, $(PLATFORMS), $(p)::lilypond $(p)::lilypond-doc $(p)::lilypond-installer) 2>&1 | grep ^dependencies | tr ' ' '\n' | grep 'tools::') +tools := $(shell $(GUB) --show-dependencies $(foreach p, $(PLATFORMS), $(p)::lilypond $(p)::lilypond-doc $(p)::lilypond-installer) 2>&1 | grep ^dependencies | tr ' ' '\n' | grep 'tools::') + +ptools: + $(GUB) --show-dependencies $(foreach p, $(PLATFORMS), $(p)::lilypond $(p)::lilypond-doc $(p)::lilypond-installer) 2>&1 | grep ^dependencies | tr ' ' '\n' | grep 'tools::' ################################################################ # docs lilypond.make c366f3a41e0fb1747a61f96188b223a73b4a79cb Jan Nieuwenhuizen janneke@gnu.org http://github.com/janneke/gub/commit/042571af1c672090da5bf71b3f8b7c2006750407 042571af1c672090da5bf71b3f8b7c2006750407 2009-09-13T06:23:17-07:00 2009-09-13T06:23:17-07:00 *.make: update GUB interface use, use --show-dependencies. Fixes bootstrap. Should fix http://lists.gnu.org/archive/html/lilypond-devel/2009-09/msg00311.html Thanks, John. bdf25c91f3a0f1174afdccbc5de805b9792e9b4a Jan Nieuwenhuizen janneke@gnu.org