浏览代码

tools/Makefile: suppress using emacs and makeinfo for autotools

When building autotools, suppress trying to invoke emacs and
makeinfo. Unfortunately binutils and/or gcc refuse to build without
makeinfo, even if it is supposed to be suppressed. Sigh.
H. Peter Anvin 1 年之前
父节点
当前提交
39267928d5
共有 1 个文件被更改,包括 9 次插入5 次删除
  1. 9 5
      tools/Makefile

+ 9 - 5
tools/Makefile

@@ -10,6 +10,8 @@ all_config = --prefix=$(prefix)
 
 z80_config = $(all_config) --target=z80-none-elf
 
+all: gnu
+
 include ../riscv-opts.mk
 export riscv_target_flags
 
@@ -59,8 +61,6 @@ riscv_newlib_configargs := \
 	--enable-newlib-reent-small
 export riscv_newlib_configargs
 
-all: gnu
-
 clean:
 	rm -rf *.build *~ *.bak \#* .\#* *.deps *.stamp
 
@@ -77,8 +77,6 @@ gnu.src:
 
 .PHONY: gnu
 gnu:
-	echo MAKE=$(MAKE)
-	echo MAKEFLAGS=$(MAKEFLAGS)
 	$(MAKE) gnu.src
 	$(MAKE) autotools
 	$(MAKE) gnu.bin
@@ -91,6 +89,12 @@ gnu.bin: gnu.riscv.build gnu.z80.build.stamp
 autoconf-ver = 2.69
 automake-ver = 1.15.1
 
+# Don't require these tools for autotools
+# autoconf seems picky about the makeinfo version (and we don't need to
+# build an emacs .el), but binutils breaks trying to build without
+# makeinfo. Sigh.
+autotools-disable = EMACS=no MAKEINFO=no TEXI2ANY=no TEXI2DVI=no TEXI2PDF=no
+
 .PHONY: autotools
 autotools: gnu.autoconf.build.stamp gnu.automake.build.stamp
 
@@ -99,7 +103,7 @@ gnu.automake.build.stamp: gnu.autoconf.build.stamp
 .PHONY: gnu.auto%.build
 gnu.auto%.build: gnusrc/auto%
 	mkdir -p $@
-	cd $@ && $(rsetup) ../$</configure $(all_config)
+	cd $@ && $(rsetup) $(autotools-disable) ../$</configure $(all_config)
 	$(RMAKE) -C $@
 	$(RMAKE) -C $@ install
 	: >$@.stamp