X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/dc74adf4453d5f9bfaf5896e7de43938ab628472..74d78766e81f8608556c0ca22a3804f4b5fd1a87:/toolchain/gcc/final/Makefile

diff --git a/toolchain/gcc/final/Makefile b/toolchain/gcc/final/Makefile
index 1decc9515..b0fe20023 100644
--- a/toolchain/gcc/final/Makefile
+++ b/toolchain/gcc/final/Makefile
@@ -3,12 +3,13 @@ GCC_VARIANT:=final
 include ../common.mk
 
 GCC_CONFIGURE += \
+	--with-headers=$(TOOLCHAIN_DIR)/include \
 	--enable-languages=$(TARGET_LANGUAGES) \
 	--enable-shared \
 	--enable-threads \
 	--with-slibdir=$(TOOLCHAIN_DIR)/lib
 
-ifneq ($(CONFIG_GCC_VERSION_4_5),)
+ifneq ($(CONFIG_GCC_VERSION_4_5)$(CONFIG_GCC_VERSION_4_6),)
   GCC_CONFIGURE += \
 	--enable-lto \
 	--with-libelf=$(TOPDIR)/staging_dir/host
@@ -22,6 +23,11 @@ else
 	--disable-tls
 endif
 
+ifneq ($(CONFIG_SJLJ_EXCEPTIONS),)
+  GCC_CONFIGURE += \
+	--enable-sjlj-exceptions
+endif
+
 define Host/Configure
 	mkdir -p $(GCC_BUILD_DIR) $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)
 	# Important!  Required for limits.h to be fixed.
@@ -65,6 +71,7 @@ define Host/Install
 		done; \
 	);
 	$(if $(CONFIG_EXTRA_TARGET_ARCH),$(call SetupExtraArch))
+	$(SCRIPT_DIR)/patch-specs.sh "$(TOOLCHAIN_DIR)"
 endef
 
 $(eval $(call HostBuild))