diff options
author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-06 17:10:45 +0000 |
---|---|---|
committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-06 17:10:45 +0000 |
commit | 1a467d902b3895bf52c15d4657e042390416ed44 (patch) | |
tree | 53fdda6bf17d689b7d8cfcc2482755b2a95e3fbf /toolchain/gcc/Makefile | |
parent | ce094a4b73365300ed53c6de4d4a2f7b22bc4c35 (diff) |
[toolchain] gcc: only enable/disable TLS support in final stage (closes: #6788)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20018 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/gcc/Makefile')
-rw-r--r-- | toolchain/gcc/Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 9c820f2fec..9536cc245b 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -116,11 +116,6 @@ else --disable-libssp endif -ifeq ($(CONFIG_TLS_SUPPORT),) - GCC_CONFIGURE+= \ - --disable-tls -endif - ifneq ($(CONFIG_EXTRA_TARGET_ARCH),) GCC_CONFIGURE+= \ --enable-biarch \ @@ -159,6 +154,14 @@ GCC_CONFIGURE_STAGE2:= \ --enable-threads \ --with-slibdir=$(TOOLCHAIN_DIR)/lib \ +ifneq ($(CONFIG_TLS_SUPPORT),) + GCC_CONFIGURE_STAGE2+= \ + --enable-tls +else + GCC_CONFIGURE_STAGE2+= \ + --disable-tls +endif + ifdef CONFIG_powerpc TARGET_CFLAGS := $(patsubst -Os,-O2,$(TARGET_CFLAGS)) endif |