From 8330521d9b370bad4b804d7fb6dfeb9ed8aafc2c Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sun, 29 Oct 2017 23:21:19 +0000
Subject:  Support default pie

---
 tools/gen-deps.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'tools/gen-deps.sh')

diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index 4eb487e..67ec2d4 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -59,13 +59,17 @@ for dir in $(ls -1 src | grep -v ^include) ; do
     deps=
     libs=
     while read dep ; do
-      if echo $dep | grep -q -e ^-l -e '^\${LIB.*}$' -e '^\${.*_LIB}$' ; then
+      if echo $dep | grep -q -e ^-l -e '^\${.*_LIB}' ; then
         libs="$libs $dep"
       else
         deps="$deps src/$dir/$dep"
       fi
     done < src/$dir/deps-lib/$file
+    echo 'ifeq ($(strip $(DEFAULT_PIE)),)'
     echo "lib${file}.a.xyzzy:$deps"
+    echo else
+    echo "lib${file}.a.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
+    echo endif
     echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs"
     echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
   done
@@ -77,7 +81,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do
       if echo $dep | grep -q -- \\.o$ ; then
         dep="src/$dir/$dep"
       fi
-      if echo $dep | grep -q -- '^\${.*_LIB}$' ; then
+      if echo $dep | grep -q -- '^\${.*_LIB}' ; then
         libs="$libs $dep"
       else
         deps="$deps $dep"
-- 
cgit v1.2.3