From 0d86d7df3cf62ed0a010197f2963842311b0a4b8 Mon Sep 17 00:00:00 2001 From: Tomasz Kramkowski Date: Fri, 6 Aug 2021 17:18:20 +0100 Subject: make do-link executable from /usr/bin/env On openbsd the script interpreter of an interpreter script can't be an interpreter script (script(7)) so do-link must be ran with /usr/bin/env which means the type parameter needs to be a variable set in the do file. --- do-link | 5 ++--- libpack.do | 3 ++- test.do | 3 ++- test_gen.do | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/do-link b/do-link index 189e899..76ca11b 100755 --- a/do-link +++ b/do-link @@ -1,8 +1,7 @@ #!/usr/bin/env bash set -e -type=$1 -. "$2" # .do file which we are "interpreting" +. "$1" # .do file which we are "interpreting" redo-ifchange "$0" "link-$type.tool" "${objects[@]}" -shift 2 +shift . "./link-$type.tool" "${cmd[@]}" diff --git a/libpack.do b/libpack.do index 9fa753d..8cd27f6 100755 --- a/libpack.do +++ b/libpack.do @@ -1,2 +1,3 @@ -#!./do-link library +#!/usr/bin/env ./do-link +type=library objects=(common.o pack.o trace.o unpack.o ieee754b.o) diff --git a/test.do b/test.do index 5ebdb6e..9b8f93b 100755 --- a/test.do +++ b/test.do @@ -1,2 +1,3 @@ -#!./do-link executable +#!/usr/bin/env ./do-link +type=executable objects=(common.o pack.o test.o trace.o unpack.o ieee754b.o) diff --git a/test_gen.do b/test_gen.do index cffe9df..b4b480a 100755 --- a/test_gen.do +++ b/test_gen.do @@ -1,2 +1,3 @@ -#!./do-link executable-host +#!/usr/bin/env ./do-link +type=executable-host objects=(test_gen.o) -- cgit v1.2.3-54-g00ecf