From 7d398c44ee280c4fcbaefd8e3216c5d1b4bafb20 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Mon, 26 Sep 2016 10:18:05 -0400
Subject: [PATCH] contrib: fix wrong toolset used to build boost
This patch fixes regression introduced in commit 6f57f00258.
clang++ was used in place of g++ on Android platform.
Change-Id: Idcb7baafa842eb1f68e9a9ed02e5d7949e1588d5
Tuleap: #682
---
contrib/src/boost/rules.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/boost/rules.mak b/contrib/src/boost/rules.mak
index 89783f2616..7f70fe77c0 100644
--- a/contrib/src/boost/rules.mak
+++ b/contrib/src/boost/rules.mak
@@ -53,7 +53,7 @@ ifdef HAVE_WIN32
cd $< && echo ";" >> user-config.jam
endif
ifdef HAVE_ANDROID
- cd $< && echo "using gcc : android : clang++" > user-config.jam
+ cd $< && echo "using gcc : android : g++" > user-config.jam
cd $< && echo ":" >> user-config.jam
cd $< && echo "<archiver>${HOST}-ar" >> user-config.jam
cd $< && echo "<compileflags>-DANDROID" >> user-config.jam
--
GitLab