summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-04-14 18:24:20 +0200
committerMichał Górny <mgorny@gentoo.org>2017-04-14 18:27:58 +0200
commit4fc1e8ada0799f72570e3c362af703dc17f81650 (patch)
tree48d9647ddbbc5538e430654755571256dabcf343 /sys-devel/make
parentmedia-libs/giflib: Replace eutils inherit w/ split eclasses (diff)
downloadgentoo-4fc1e8ada0799f72570e3c362af703dc17f81650.tar.gz
gentoo-4fc1e8ada0799f72570e3c362af703dc17f81650.tar.bz2
gentoo-4fc1e8ada0799f72570e3c362af703dc17f81650.zip
Revert "sys-devel/make: default CXX to c++ instead of g++, #589894"
The change was accidentally done to the stable ebuild. Will reland with ~arch revbump. Reverts: bace4a893fbf789675d576be2a291aef33db90f5
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.ebuild (renamed from sys-devel/make/make-4.2.1-r1.ebuild)1
2 files changed, 0 insertions, 14 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
deleted file mode 100644
index 4d592086a6f..00000000000
--- a/sys-devel/make/files/make-4.2-default-cxx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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-r1.ebuild b/sys-devel/make/make-4.2.1.ebuild
index 17448b34b98..70e90b6bf62 100644
--- a/sys-devel/make/make-4.2.1-r1.ebuild
+++ b/sys-devel/make/make-4.2.1.ebuild
@@ -22,7 +22,6 @@ RDEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
- "${FILESDIR}"/${PN}-4.2-default-cxx.patch
)
src_prepare() {