diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-05-13 17:44:20 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-05-13 17:44:20 +0000 |
| commit | 396f5ab6ee982a171b497d9c88c598c88ff2a040 (patch) | |
| tree | db8d97d4c59a11a5875dbc51f50d599e2313667e /Makefile.inc1 | |
| parent | 96807c23ce94409bd91259ad3ea2951e44e9a1f0 (diff) | |
| download | src-396f5ab6ee982a171b497d9c88c598c88ff2a040.tar.gz src-396f5ab6ee982a171b497d9c88c598c88ff2a040.zip | |
Support libsoft for restage.
This is essentially fixing a merge conflict.
Notes
Notes:
svn path=/head/; revision=299686
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 465610661d34..3fa5537c2485 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1002,8 +1002,8 @@ restage: .MAKE .PHONY @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if defined(LIB32TMP) && ${MK_LIB32} != "no" - ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 +.if defined(LIBCOMPAT) + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install${libcompat} .endif redistribute: .MAKE .PHONY |