From 396b6bf1ebd574790edc840718608c77a2773b5f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 6 Oct 2018 08:26:16 +0200 Subject: [PATCH] * In debci, run qualify-clang.sh in verbose mode * Only run the g++ test if g++ exist --- debian/changelog | 10 +++++----- debian/qualify-clang.sh | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index c4877fe0..b02f03d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,12 @@ -llvm-toolchain-7 (1:7-5) UNRELEASED; urgency=medium +llvm-toolchain-7 (1:7-5) unstable; urgency=medium + + * In debci, run qualify-clang.sh in verbose mode + * Only run the g++ test if g++ exist [ Reshabh Sharma ] * Run check-openmp to test OpenMP - [ Sylvestre Ledru ] - * In debci, run qualify-clang.sh in verbose mode - - -- Sylvestre Ledru Fri, 05 Oct 2018 08:40:44 +0200 + -- Sylvestre Ledru Sat, 06 Oct 2018 08:25:48 +0200 llvm-toolchain-7 (1:7-4) unstable; urgency=medium diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 9d31fef4..9b797947 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -283,9 +283,11 @@ int main() { clang++-$VERSION -std=c++17 -stdlib=libc++ foo.cpp -lc++experimental -lc++fs -o o ./o > /dev/null +if test -f /usr/bin/g++; then g++ -nostdinc++ -I/usr/lib/llvm-$VERSION/bin/../include/c++/v1/ -L/usr/lib/llvm-$VERSION/lib/ \ foo.cpp -nodefaultlibs -std=c++17 -lc++ -lc++abi -lm -lc -lgcc_s -lgcc|| true ./o > /dev/null +fi if test ! -f /usr/lib/llvm-$VERSION/include/polly/LinkAllPasses.h; then