From 52810d8db33878940387df0cafd6d02602bd6bf9 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 24 Aug 2015 14:31:05 +0200 Subject: [PATCH] Makefile.inc1: Respect WITHOUT_TCSH Otherwise the built fails if the sources aren't available: -------------------------------------------------------------- >>> stage 2.3: build tools -------------------------------------------------------------- cd /usr/src; MAKEOBJDIRPREFIX=/usr/obj INSTALL="sh /usr/src/tools/install.sh" TOOLS_PREFIX=/usr/obj/usr/src/tmp PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/bin:/sbin:/bin:/usr/sbin:/usr/bin WORLDTMP=/usr/obj/usr/src/tmp MAKEFLAGS="-m /usr/src/tools/build/mk -j 2 -J 15,16 -m /usr/src/share/mk" make -f Makefile.inc1 TARGET=amd64 TARGET_ARCH=amd64 DESTDIR= BOOTSTRAPPING=110051 0 SSP_CFLAGS= -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no MK_CLANG_EXTRAS=no MK_CLANG_FULL=no MK_LLDB=no MK_TESTS=no build-tools --- build-tools_bin/csh --- --- build-tools_bin/sh --- --- build-tools_bin/csh --- ===> bin/csh (obj,build-tools) --- build-tools_bin/sh --- ===> bin/sh (obj,build-tools) --- obj --- --- build-tools_bin/csh --- cd: /usr/src/bin/csh/../../contrib/tcsh/nls/et: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/finnish: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/french: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/german: No such file or directory --- build-tools_bin/sh --- --- mknodes.o --- cc -O2 -pipe -DSHELL -I. -I/usr/src/bin/sh -g -std=gnu99 -Qunused-arguments -I/usr/obj/usr/src/tmp/legacy/usr/include -L/usr/obj/usr/src/tmp/legacy/usr/lib /usr/src/bin/sh/mknodes.c -o mknodes.o --- build-tools_bin/csh --- cd: /usr/src/bin/csh/../../contrib/tcsh/nls/greek: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/italian: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/ja: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/russian: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/spanish: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/ukrainian: No such file or directory --- obj --- /usr/obj/usr/src/bin/csh created for /usr/src/bin/csh cd: /usr/src/bin/csh/../../contrib/tcsh/nls/et: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/finnish: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/french: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/german: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/greek: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/italian: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/ja: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/russian: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/spanish: No such file or directory cd: /usr/src/bin/csh/../../contrib/tcsh/nls/ukrainian: No such file or directory make[3]: make[3]: don't know how to make gethost.c. Stop make[3]: stopped in /usr/src/bin/csh *** [build-tools_bin/csh] Error code 2 make[2]: stopped in /usr/src --- build-tools_bin/sh --- A failure has been detected in another branch of the parallel make make[3]: stopped in /usr/src/bin/sh *** [build-tools_bin/sh] Error code 2 make[2]: stopped in /usr/src 2 errors make[2]: stopped in /usr/src It's not obvious why tcsh is built as build tool in the first place as nothing seems to break without it. Obtained from: ElectroBSD --- Makefile.inc1 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2d86f1139154..c9ce41af0c7c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1813,8 +1813,12 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools _rescue=rescue/rescue .endif +.if ${MK_TCSH} != "no" +_tcsh=bin/csh +.endif + .for _tool in \ - bin/csh \ + ${_tcsh} \ bin/sh \ ${LOCAL_TOOL_DIRS} \ lib/ncurses/ncurses \ @@ -1971,7 +1975,7 @@ native-xtools: .PHONY bin/cat \ bin/chmod \ bin/cp \ - bin/csh \ + ${_tcsh} \ bin/echo \ bin/expr \ bin/hostname \ -- 2.14.1