Fix gen-deps.sh for cross-builds

2 files changed, 21 insertions, 21 deletions

diff --git a/package/deps.mak b/package/deps.mak
index 8eec840..ffc9644 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -42,23 +42,23 @@ libs6rc.a.xyzzy: src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_chec
 endif
 libs6rc.so.xyzzy: EXTRA_LIBS := -ls6 -lskarnet
 libs6rc.so.xyzzy: src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo
-s6-rc: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-rc: src/s6-rc/s6-rc.o ${LIBS6RC} -ls6 -lskarnet
-s6-rc-bundle: EXTRA_LIBS :=
-s6-rc-bundle: src/s6-rc/s6-rc-bundle.o ${LIBS6RC} -lexecline -lskarnet
-s6-rc-compile: EXTRA_LIBS :=
-s6-rc-compile: src/s6-rc/s6-rc-compile.o ${LIBS6RC} -lexecline -lskarnet
-s6-rc-db: EXTRA_LIBS :=
-s6-rc-db: src/s6-rc/s6-rc-db.o ${LIBS6RC} -lskarnet
-s6-rc-dryrun: EXTRA_LIBS := ${SYSCLOCK_LIB}
-s6-rc-dryrun: src/s6-rc/s6-rc-dryrun.o -lskarnet
-s6-rc-fdholder-filler: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SOCKET_LIB}
-s6-rc-fdholder-filler: src/s6-rc/s6-rc-fdholder-filler.o -ls6 -lskarnet
-s6-rc-format-upgrade: EXTRA_LIBS :=
-s6-rc-format-upgrade: src/s6-rc/s6-rc-format-upgrade.o ${LIBS6RC} -lskarnet
-s6-rc-init: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SOCKET_LIB} ${SPAWN_LIB}
-s6-rc-init: src/s6-rc/s6-rc-init.o ${LIBS6RC} -ls6 -lskarnet
-s6-rc-oneshot-run: EXTRA_LIBS :=
-s6-rc-oneshot-run: src/s6-rc/s6-rc-oneshot-run.o ${LIBS6RC} -lskarnet
-s6-rc-update: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SOCKET_LIB} ${SPAWN_LIB}
-s6-rc-update: src/s6-rc/s6-rc-update.o ${LIBS6RC} -ls6 -lexecline -lskarnet
+s6-rc: EXTRA_LIBS := -ls6 -lskarnet ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-rc: src/s6-rc/s6-rc.o ${LIBS6RC}
+s6-rc-bundle: EXTRA_LIBS := -lexecline -lskarnet
+s6-rc-bundle: src/s6-rc/s6-rc-bundle.o ${LIBS6RC}
+s6-rc-compile: EXTRA_LIBS := -lexecline -lskarnet
+s6-rc-compile: src/s6-rc/s6-rc-compile.o ${LIBS6RC}
+s6-rc-db: EXTRA_LIBS := -lskarnet
+s6-rc-db: src/s6-rc/s6-rc-db.o ${LIBS6RC}
+s6-rc-dryrun: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB}
+s6-rc-dryrun: src/s6-rc/s6-rc-dryrun.o
+s6-rc-fdholder-filler: EXTRA_LIBS := -ls6 -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB}
+s6-rc-fdholder-filler: src/s6-rc/s6-rc-fdholder-filler.o
+s6-rc-format-upgrade: EXTRA_LIBS := -lskarnet
+s6-rc-format-upgrade: src/s6-rc/s6-rc-format-upgrade.o ${LIBS6RC}
+s6-rc-init: EXTRA_LIBS := -ls6 -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB} ${SPAWN_LIB}
+s6-rc-init: src/s6-rc/s6-rc-init.o ${LIBS6RC}
+s6-rc-oneshot-run: EXTRA_LIBS := -lskarnet
+s6-rc-oneshot-run: src/s6-rc/s6-rc-oneshot-run.o ${LIBS6RC}
+s6-rc-update: EXTRA_LIBS := -ls6 -lexecline -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB} ${SPAWN_LIB}
+s6-rc-update: src/s6-rc/s6-rc-update.o ${LIBS6RC}
diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index 6383ac2..27e5b3e 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -81,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 -e ^-l -e '^\${.*_LIB}' ; then
         libs="$libs $dep"
       else
         deps="$deps $dep"