From 787a5f9c555b8b9b19153ab465c6a1533f213511 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Mon, 16 Jul 2018 16:46:06 +0300 Subject: [PATCH] gcc: enable compilation with gcc 7.x Defining _GLIBCXX_INCLUDE_NEXT_C_HEADERS instructs gcc 7.x libstdc++ to include the system's stdlib.h and math.h, and not their own. Signed-off-by: Eneas U de Queiroz (cherry picked from commit 054d5273cb8b37520cec524f9e5ab23ba73e282e) --- devel/gcc/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/devel/gcc/Makefile b/devel/gcc/Makefile index 9d6a46f46a..716f593d4d 100644 --- a/devel/gcc/Makefile +++ b/devel/gcc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gcc PKG_VERSION:=5.4.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION) PKG_HASH:=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -22,6 +22,7 @@ include $(INCLUDE_DIR)/package.mk TARGET_LANGUAGES:="c,c++" BUGURL=https://dev.openwrt.org/ PKGVERSION=OpenWrt GCC $(PKG_VERSION) +TARGET_CPPFLAGS += -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS # not using sstrip here as this fucks up the .so's somehow STRIP:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)strip @@ -92,6 +93,8 @@ define Build/Prepare cp $(PKG_BUILD_DIR)/config.sub $(PKG_BUILD_DIR)/mpc/ endef +TARGET_CXX += -std=gnu++03 +CONFIGURE_ARGS += CXX_FOR_TARGET="$(TARGET_CXX)" CXXFLAGS_FOR_TARGET="-g -O2 -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS" define Build/Configure (cd $(PKG_BUILD_DIR); rm -f config.cache; \ -- 2.30.2