changeset 5558:2151da189ddb

*.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.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Sun, 13 Sep 2009 15:23:17 +0200
parents a1991215afb8
children 3e649d2afe5b
files compilers.make lilypond.make
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/compilers.make	Fri Sep 11 19:28:09 2009 +0200
+++ b/compilers.make	Sun Sep 13 15:23:17 2009 +0200
@@ -32,7 +32,7 @@
 #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
 
--- a/lilypond.make	Fri Sep 11 19:28:09 2009 +0200
+++ b/lilypond.make	Sun Sep 13 15:23:17 2009 +0200
@@ -142,7 +142,10 @@
 ################################################################
 # 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