Page MenuHomeFreeBSD
Files F154132060

D16814.id46984.diff
No OneTemporary
Actions

D16814.id46984.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -1031,19 +1031,21 @@
@echo "--------------------------------------------------------------"
@echo ">>> stage 2.1: cleaning up the object tree"
@echo "--------------------------------------------------------------"
- ${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR}
+ # Avoid including bsd.compiler.mk in clean and obj with _NO_INCLUDE_COMPILERMK
+ # since the restricted $PATH might not contain a valid cc binary
+ ${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=t ${CLEANDIR}
.if defined(LIBCOMPAT)
- ${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} -f Makefile.inc1 ${CLEANDIR}
+ ${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} _NO_INCLUDE_COMPILERMK=t -f Makefile.inc1 ${CLEANDIR}
.endif
.else
- ${_+_}cd ${.CURDIR}; ${WMAKE} _cleanobj_fast_depend_hack
+ ${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack
.endif # !defined(NO_CLEAN)
_obj:
@echo
@echo "--------------------------------------------------------------"
@echo ">>> stage 2.2: rebuilding the object tree"
@echo "--------------------------------------------------------------"
- ${_+_}cd ${.CURDIR}; ${WMAKE} obj
+ ${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=t obj
_build-tools:
@echo
@echo "--------------------------------------------------------------"
Index: share/mk/bsd.compiler.mk
===================================================================
--- share/mk/bsd.compiler.mk
+++ share/mk/bsd.compiler.mk
@@ -28,7 +28,16 @@
# This file may be included multiple times, but only has effect the first time.
#
-.if !target(__<bsd.compiler.mk>__)
+.if defined(_NO_INCLUDE_COMPILERMK)
+# If _NO_INCLUDE_COMPILERMK is set we are doing a make obj/cleandir/cleanobj
+# and might not have a valid compiler on $PATH yet. In this case just set the
+# variables that are expected by the other .mk files and return
+COMPILER_TYPE=none
+X_COMPILER_TYPE=none
+COMPILER_VERSION=0
+X_COMPILER_VERSION=0
+COMPILER_FEATURES=none
+.elif !target(__<bsd.compiler.mk>__)
__<bsd.compiler.mk>__:
.include <bsd.opts.mk>

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 27, 10:39 AM (12 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32223023
Default Alt Text
D16814.id46984.diff (2 KB)

Event Timeline