summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-05-25 22:04:45 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-05-25 22:04:45 +0000
commit674fc6d0449e69f8379a770bd10e879d443740b7 (patch)
tree84638e9e1e00e3890be802c6ae2a6d9dfd45b92b /profiles
parentVersion bump (diff)
downloadhistorical-674fc6d0449e69f8379a770bd10e879d443740b7.tar.gz
historical-674fc6d0449e69f8379a770bd10e879d443740b7.tar.bz2
historical-674fc6d0449e69f8379a770bd10e879d443740b7.zip
Make the clang profile use libcxx
Diffstat (limited to 'profiles')
-rw-r--r--profiles/default/bsd/ChangeLog7
-rw-r--r--profiles/default/bsd/fbsd/amd64/9.1/clang/packages5
-rw-r--r--profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build3
-rw-r--r--profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc6
4 files changed, 14 insertions, 7 deletions
diff --git a/profiles/default/bsd/ChangeLog b/profiles/default/bsd/ChangeLog
index d3786a5e9126..8e9fd57744f4 100644
--- a/profiles/default/bsd/ChangeLog
+++ b/profiles/default/bsd/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.145 2013/05/25 20:32:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.146 2013/05/25 22:04:45 aballier Exp $
+
+ 25 May 2013; Alexis Ballier <aballier@gentoo.org>
+ fbsd/amd64/9.1/clang/packages, fbsd/amd64/9.1/clang/packages.build,
+ fbsd/amd64/9.1/clang/profile.bashrc:
+ Make the clang profile use libcxx
25 May 2013; Alexis Ballier <aballier@gentoo.org>
fbsd/amd64/9.1/clang/packages.build, fbsd/packages.build:
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages b/profiles/default/bsd/fbsd/amd64/9.1/clang/packages
index 57df4ebbf9e7..ceaaa6040250 100644
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages
+++ b/profiles/default/bsd/fbsd/amd64/9.1/clang/packages
@@ -1,9 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2013 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/packages,v 1.1 2012/10/18 22:55:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/packages,v 1.2 2013/05/25 22:04:45 aballier Exp $
# Don't remove gcc from here: clang uses it for crt{begin,end}*.o and its c++
# stack.
*sys-devel/llvm
*sys-devel/clang
+*sys-libs/libcxx
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build b/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build
index 7c4354d94b4b..af06e6121663 100644
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build
+++ b/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build,v 1.3 2013/05/25 20:32:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/packages.build,v 1.4 2013/05/25 22:04:45 aballier Exp $
# This file describes the packages needed to build a stage 1 based on this
# profile. Packages in this file are built in order.
@@ -50,3 +50,4 @@ sys-freebsd/freebsd-usbin
sys-freebsd/freebsd-contrib
sys-devel/llvm
sys-devel/clang
+sys-libs/libcxx
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc b/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc
index 7b7a3adc18cc..af919bc6fc0c 100644
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc
+++ b/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc
@@ -1,8 +1,8 @@
#!/bin/bash
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc,v 1.1 2012/10/18 22:55:25 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/profile.bashrc,v 1.2 2013/05/25 22:04:45 aballier Exp $
# Check if clang/clang++ exist before setting them so that we can more easily
# switch to this profile and build stages.
type -P clang > /dev/null && export CC=clang
-type -P clang++ > /dev/null && export CXX=clang++
+type -P clang++ > /dev/null && [ -f /usr/lib/libc++.so ] && export CXX="clang++ -stdlib=libc++"