changeset 715:150598ec37e7

vanilla: clang is the default /bin/cpp implementation
author David Demelier <markand@malikania.fr>
date Mon, 05 Aug 2019 12:38:51 +0200
parents 6b4ba668a43c
children 4cf99fd03da6
files dev/clang/clang.sh dev/gcc/gcc.sh x11/libx11/libx11.sh x11/libxt/libxt.sh
diffstat 4 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/dev/clang/clang.sh	Fri Aug 02 21:20:00 2019 +0200
+++ b/dev/clang/clang.sh	Mon Aug 05 12:38:51 2019 +0200
@@ -77,6 +77,8 @@
 		$with_lld
 	make
 	make DESTDIR=$DESTDIR install
+	# Compatibility symlink for many autotools programs.
+	ln -sf $DESTDIR/bin/clang-cpp $DESTDIR/bin/cpp
 	cd ..
 
 	cd ..
--- a/dev/gcc/gcc.sh	Fri Aug 02 21:20:00 2019 +0200
+++ b/dev/gcc/gcc.sh	Mon Aug 05 12:38:51 2019 +0200
@@ -77,7 +77,7 @@
 		--disable-bootstrap \
 		--disable-libsanitizer \
 		--disable-libgomp \
-		--with-pkgversion="Vanilla 0.1" \
+		--with-pkgversion="Vanilla 0.2" \
 		--disable-static \
 		$with_nls
 	make
@@ -87,6 +87,8 @@
 	done
 	rm -f $DESTDIR/lib/gcc/x86_64-linux-musl/8.3.0/plugin/libcc1plugin.la
 	rm -f $DESTDIR/lib/gcc/x86_64-linux-musl/8.3.0/plugin/libcp1plugin.la
+	# Avoid conflict with clang-cpp.
+	rm -f $DESTDIR/bin/cpp
 	cd ..
 
 	cd ..
--- a/x11/libx11/libx11.sh	Fri Aug 02 21:20:00 2019 +0200
+++ b/x11/libx11/libx11.sh	Mon Aug 05 12:38:51 2019 +0200
@@ -43,7 +43,6 @@
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
-	CPP="$CC -E -" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
--- a/x11/libxt/libxt.sh	Fri Aug 02 21:20:00 2019 +0200
+++ b/x11/libxt/libxt.sh	Mon Aug 05 12:38:51 2019 +0200
@@ -41,7 +41,6 @@
 	cd libXt-$PKGVERSION
 
 	CC="$CC" \
-	CPP="$CC -E -" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \