summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2016-01-25 14:13:28 +0000
committergjb <gjb@FreeBSD.org>2016-01-25 14:13:28 +0000
commitead3a2f82422177688f88922302e4f6c6da596ee (patch)
tree7a14f41a243865c2af9772e86149173b64f996db /gnu
parent146806cdf8adbf206d5a59ec815b5fba8c007024 (diff)
parentcab03eda218d51a742f61606929c2a302a707617 (diff)
downloadFreeBSD-src-ead3a2f82422177688f88922302e4f6c6da596ee.zip
FreeBSD-src-ead3a2f82422177688f88922302e4f6c6da596ee.tar.gz
MFH
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'gnu')
-rw-r--r--gnu/lib/libgcc/Makefile7
-rw-r--r--gnu/lib/libreadline/readline/Makefile2
2 files changed, 7 insertions, 2 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index ec3c7f4..f3166e7 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -193,7 +193,12 @@ LIB2_DIVMOD_FUNCS:= ${LIB2_DIVMOD_FUNCS:S/${sym}//g}
.endif
COMMONHDRS= tm.h tconfig.h options.h gthr-default.h
-.if ${MK_LLVM_LIBUNWIND} == no
+.if ${MK_LLVM_LIBUNWIND} != "no"
+# unwind.h is a generated file when MK_LLVM_LIBUNWIND == "no", and a stale
+# copy may be left behind in OBJDIR when switching, so remove it explicitly.
+beforebuild:
+ @rm -f ${.OBJDIR}/unwind.h
+.else
COMMONHDRS+= unwind.h
.endif
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index 17c84ae..1947b3e 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -2,7 +2,7 @@
LIB= readline
INTERNALLIB= yes
-NO_MAN= yes
+MAN=
TILDESRC= tilde.c
SRCS= readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
OpenPOWER on IntegriCloud