summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Zhang <zhanglei.april@gmail.com>2016-07-28 05:36:35 +0800
committerMichał Górny <mgorny@gentoo.org>2017-04-14 17:34:25 +0200
commitbace4a893fbf789675d576be2a291aef33db90f5 (patch)
treefbd7e95a3b61c1c43d52607b3b1d592548f7acb5 /sys-devel/make
parentsys-kernel/hardened-sources: remove older unstable versions (diff)
downloadgentoo-bace4a893fbf789675d576be2a291aef33db90f5.tar.gz
gentoo-bace4a893fbf789675d576be2a291aef33db90f5.tar.bz2
gentoo-bace4a893fbf789675d576be2a291aef33db90f5.zip
sys-devel/make: default CXX to c++ instead of g++, #589894
Closes: https://github.com/gentoo/gentoo/pull/1982 Package-Manager: portage-2.2.28 Reviewed-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'sys-devel/make')
-rw-r--r--sys-devel/make/files/make-4.2-default-cxx.patch13
-rw-r--r--sys-devel/make/make-4.2.1-r1.ebuild (renamed from sys-devel/make/make-4.2.1.ebuild)1
2 files changed, 14 insertions, 0 deletions
diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch
new file mode 100644
index 000000000000..4d592086a6ff
--- /dev/null
+++ b/sys-devel/make/files/make-4.2-default-cxx.patch
@@ -0,0 +1,13 @@
+diff --git a/default.c b/default.c
+index 3d865c7..e8b3ed6 100644
+--- a/default.c
++++ b/default.c
+@@ -530,7 +530,7 @@ static const char *default_variables[] =
+ "OBJC", "gcc",
+ #else
+ "CC", "cc",
+- "CXX", "g++",
++ "CXX", "c++",
+ "OBJC", "cc",
+ #endif
+
diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1-r1.ebuild
index 70e90b6bf623..17448b34b987 100644
--- a/sys-devel/make/make-4.2.1.ebuild
+++ b/sys-devel/make/make-4.2.1-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
+ "${FILESDIR}"/${PN}-4.2-default-cxx.patch
)
src_prepare() {