Browse Source

sorry libgcc problem still exist. don't know why

Waldemar Brodkorb 10 years ago
parent
commit
1c089110a3

+ 5 - 1
package/busybox/Makefile

@@ -38,7 +38,11 @@ BB_MAKE_FLAGS:=		V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \
 			HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
 			-C ${WRKBUILD} 
 ifneq (${ADK_NATIVE},y)
-BB_MAKE_FLAGS+=		CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS="-static-libgcc"
+ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y)
+BB_MAKE_FLAGS+=		CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc'
+else
+BB_MAKE_FLAGS+=		CROSS_COMPILE="$(TARGET_CROSS)"
+endif
 else
 BB_MAKE_FLAGS+=		EXTRA_LDFLAGS="-static-libgcc"
 endif

+ 2 - 0
package/cfgfs/Makefile

@@ -26,7 +26,9 @@ $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
+ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y)
 TARGET_LDFLAGS+=	-static-libgcc
+endif
 
 do-install:
 	${INSTALL_DIR} ${IDIR_CFGFS}/sbin

+ 3 - 0
package/dropbear/Makefile

@@ -32,7 +32,9 @@ ifeq ($(ADK_STATIC),y)
 TARGET_LDFLAGS+=	-static
 endif
 
+ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y)
 TARGET_LDFLAGS+=	-static-libgcc
+endif
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 CONFIGURE_ARGS+=	--disable-pam \
@@ -52,6 +54,7 @@ else
 CONFIGURE_ENV+=		conf_utmp_location=/var/run/utmp
 endif
 
+
 pre-configure:
 	$(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(WRKBUILD)/options.h
 	$(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(WRKBUILD)/options.h

+ 1 - 0
package/musl/Config.in.manual

@@ -4,6 +4,7 @@ config ADK_PACKAGE_MUSL
 	default y if ADK_TARGET_LIB_MUSL && !ADK_TOOLCHAIN_ONLY
 	default n
 	depends on ADK_TARGET_LIB_MUSL
+	select ADK_PACKAGE_LIBGCC
 	help
 	  Embedded C library.
 

+ 7 - 0
target/config/Config.in

@@ -564,6 +564,9 @@ config ADK_musl
 config ADK_libc
 	boolean
 
+config ADK_TARGET_LIB_STATIC_LIBGCC
+	boolean
+
 config ADK_TARGET_LIBC
 	string
 	default "uclibc"  if ADK_uclibc
@@ -585,6 +588,7 @@ config ADK_TARGET_LIB_UCLIBC
 		   !ADK_LINUX_SPARC64 && \
 		   !ADK_LINUX_PPC64 && \
 		   !ADK_LINUX_NATIVE
+	select ADK_TARGET_LIB_STATIC_LIBGCC
 	help
  	 http://uclibc.org
 
@@ -605,6 +609,7 @@ config ADK_TARGET_LIB_EGLIBC
 		ADK_LINUX_SPARC64 || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64
+	select ADK_TARGET_LIB_STATIC_LIBGCC
 	help
 	 http://www.eglibc.org
 
@@ -625,6 +630,7 @@ config ADK_TARGET_LIB_GLIBC
 		ADK_LINUX_SPARC64 || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64
+	select ADK_TARGET_LIB_STATIC_LIBGCC
 	help
 	 http://www.gnu.org/libc
 
@@ -646,6 +652,7 @@ config ADK_TARGET_LIB_LIBC
 	prompt "Native C library"
 	boolean
 	select ADK_libc
+	select ADK_TARGET_LIB_STATIC_LIBGCC
 	depends on ADK_LINUX_NATIVE
 
 endchoice