From eec525c43adade97ff94d839810faf7cb35bd87f Mon Sep 17 00:00:00 2001 From: Phil Pennock Date: Sun, 16 Jan 2011 18:36:55 -0500 Subject: [PATCH] Bug-fix for bash and no-dynamic case. When writing the patch, originally nothing other than a cp was needed if there were no dynamic modules. That changed, but the guard at the top did not. Remove that check. bash does not like a block which consists solely of a comment. Provide a ':' invocation. Both problems spotted by Simon Arlott -- thanks. --- src/scripts/lookups-Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile index 7069cfb69..31820ea2f 100755 --- a/src/scripts/lookups-Makefile +++ b/src/scripts/lookups-Makefile @@ -8,18 +8,14 @@ defs_source=Makefile tag_marker='MAGIC-TAG-MODS-OBJ-RULES-GO-HERE' tab=' ' -if grep -q "^LOOKUP.*=[ $tab]*2" "$defs_source" -then - # we have work to do -else - echo "No dynamic module loading support" - cp "$input" "$target" - exit 0 -fi + +# We always do something now, since there should always be a lookup, +# and now we need to run in order to put the OBJ+= rules in. if grep -q "^CFLAGS_DYNAMIC[ $tab]*=" "$defs_source" then # we have a definition, we're good to go + : # noop (true) statement for bash compatibility else echo >&2 "Missing CFLAGS_DYNAMIC inhibits building dynamic module lookup" exit 1 -- 2.30.2