From 14d8c6049474adfe7148781deb104186a70fd28c Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Mon, 17 Feb 2014 14:25:48 +1100
Subject: package gcc: enbale shared target libs

---
 src/gcc.mk | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/gcc.mk b/src/gcc.mk
index 28f26a8..6388b62 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -36,7 +36,7 @@ define $(PKG)_CONFIGURE
         --with-gnu-ld \
         --with-gnu-as \
         --disable-nls \
-        --disable-shared \
+        $(if $(BUILD_STATIC),--disable-shared) \
         --disable-multilib \
         --without-x \
         --disable-win32-registry \
@@ -54,6 +54,13 @@ define $(PKG)_CONFIGURE
         $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'")
 endef
 
+define $(PKG)_POST_BUILD
+    # TODO: find a way to configure the installation of these correctly
+    rm -f $(addprefix $(PREFIX)/$(TARGET)/bin/, c++ g++ gcc gfortran)
+    -mv '$(PREFIX)/lib/gcc/$(TARGET)/lib/'* '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'
+    -mv '$(PREFIX)/lib/gcc/$(TARGET)/'*.dll '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'
+endef
+
 define $(PKG)_BUILD_i686-pc-mingw32
     # build full cross gcc
     $($(PKG)_CONFIGURE) \
@@ -61,7 +68,7 @@ define $(PKG)_BUILD_i686-pc-mingw32
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 
-    rm -f $(addprefix $(PREFIX)/$(TARGET)/bin/, c++ g++ gcc gfortran)
+    $($(PKG)_POST_BUILD)
 endef
 
 define $(PKG)_BUILD_mingw-w64
@@ -85,7 +92,7 @@ define $(PKG)_BUILD_mingw-w64
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 
-    rm -f $(addprefix $(PREFIX)/$(TARGET)/bin/, c++ g++ gcc gfortran)
+    $($(PKG)_POST_BUILD)
 endef
 
 $(PKG)_BUILD_x86_64-w64-mingw32 = $(subst mxe-config-opts,--disable-lib32,$($(PKG)_BUILD_mingw-w64))
-- 
cgit v0.12