binary: derive library search paths; minor Windows fix

1 files changed, 1 insertions, 2 deletions

diff --git a/binary/static-gcc b/binary/static-gcc
index c08f24b2..1e4ad0eb 100755
--- a/binary/static-gcc
+++ b/binary/static-gcc
@@ -3,7 +3,6 @@
 STATIC_GCC_AR=${STATIC_GCC_AR:-ar}
 STATIC_GCC_RANLIB=${STATIC_GCC_RANLIB:-ranlib}
 STATIC_GCC_CC=${STATIC_GCC_CC:-gcc}
-STATIC_GCC_LIBDIR=${STATIC_GCC_LIBDIR:-/usr/lib}
 
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 
@@ -18,7 +17,7 @@ allargs=()
 sources=()
 objects=()
 etc=()
-libdirs=("$STATIC_GCC_LIBDIR")
+libdirs=($("$STATIC_GCC_CC" -print-search-dirs | grep libraries | cut -d= -f2 | tr ':' '\n'))
 incdirs=()
 
 linking=0