From 1e4eeb5c3b0f9156ed679c4aed50ba5f97c3939b Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Thu, 31 Aug 2017 12:13:51 -0700
Subject: Workaround for static uClibc-ng issue with -lpthread

Also, preserve .config when running test-package.sh.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 scripts/build/cc/gcc.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'scripts/build/cc')

diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 6e9036f2..54303410 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -233,7 +233,11 @@ do_cc_core_pass_2() {
     #     later, we need to build libgcc
     case "${CT_THREADS}" in
         nptl)
-            core_opts+=( "mode=shared" )
+            if [ "${CT_SHARED_LIBS}" = "y" ]; then
+                core_opts+=( "mode=shared" )
+            else
+                core_opts+=( "mode=static" )
+            fi
             core_opts+=( "build_libgcc=yes" )
             ;;
         win32)
@@ -873,10 +877,13 @@ do_gcc_backend() {
         fi
     done
 
-    [ "${CT_SHARED_LIBS}" = "y" ] || extra_config+=("--disable-shared")
     [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
     [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
 
+    if [ "${CT_SHARED_LIBS}" != "y" ]; then
+        extra_config+=("--disable-shared")
+    fi
+
     case "${CT_CC_GCC_SJLJ_EXCEPTIONS}" in
         y)  extra_config+=("--enable-sjlj-exceptions");;
         m)  ;;
-- 
cgit v1.2.3