diff options
| -rw-r--r-- | mk/vars.mk | 7 | ||||
| -rw-r--r-- | package/libgcc/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 4 |
3 files changed, 1 insertions, 14 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 88b61d318..dd025c590 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -171,13 +171,6 @@ ifeq ($(ADK_TARGET_BINFMT_FLAT_SHARED),y) TARGET_LDFLAGS+= -mid-shared-library endif -ifeq ($(ADK_TARGET_LIB_MUSL),y) -# use -static-libgcc by default only for musl -TARGET_CFLAGS+= -static-libgcc -TARGET_CXXFLAGS+= -static-libgcc -TARGET_LDFLAGS+= -static-libgcc -endif - # security optimization, see http://www.akkadia.org/drepper/dsohowto.pdf ifneq ($(ADK_TARGET_USE_LD_RELRO),) TARGET_LDFLAGS+= -Wl,-z,relro diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index 36f7ae6f2..33e405cc3 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -9,9 +9,7 @@ PKG_DESCR:= gcc library PKG_SECTION:= base/libs PKG_OPTS:= noremove -PKG_DFLT_LIBGCC:= y if !(ADK_TOOLCHAIN_ONLY) -PKG_LIBC_DEPENDS:= uclibc-ng glibc - +PKG_DFLT_LIBGCC:= y if !ADK_TOOLCHAIN_ONLY NO_DISTFILES:= 1 diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 7477b3c8a..c4b711a0a 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -77,12 +77,8 @@ ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_ GCC_FINAL_CONFOPTS+= --disable-shared else # uClibc/glibc uses libgcc_s.so.1 for pthread_cancel with dlopen -ifeq (ADK_TARGET_LIB_MUSL),y) -GCC_FINAL_CONFOPTS+= --enable-shared='libstdc++' -else GCC_FINAL_CONFOPTS+= --enable-shared='libstdc++,libgcc' endif -endif ifeq ($(ADK_TOOLCHAIN_WITH_SSP),y) GCC_FINAL_CONFOPTS+= --enable-libssp |