JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rework Perl interpreter finding logic; *buntu/dietlibc-arm{el,hf} are broken

Browse Source
This commit is contained in:
tg 2011-12-08 22:16:42 +00:00
parent 44d072a879
commit 9b04bd65b7
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Build.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.495 2011/12/04 19:59:33 tg Exp $' srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.496 2011/12/08 22:16:42 tg Exp $'
#- #-
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
# Thorsten Glaser <tg@mirbsd.org> # Thorsten Glaser <tg@mirbsd.org>
@ -1174,7 +1174,7 @@ else
#define EXTERN #define EXTERN
#define MKSH_INCLUDES_ONLY #define MKSH_INCLUDES_ONLY
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.495 2011/12/04 19:59:33 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.496 2011/12/08 22:16:42 tg Exp $");
int main(void) { printf("Hello, World!\n"); return (0); } int main(void) { printf("Hello, World!\n"); return (0); }
EOF EOF
case $cm in case $cm in
@ -1678,9 +1678,15 @@ cat >>test.sh <<-EOF
cstr='\$os = defined \$^O ? \$^O : "unknown";' cstr='\$os = defined \$^O ? \$^O : "unknown";'
cstr="\$cstr"'print \$os . ", Perl version " . \$];' cstr="\$cstr"'print \$os . ", Perl version " . \$];'
for perli in \$PERL perl5 perl no; do for perli in \$PERL perl5 perl no; do
[[ \$perli = no ]] && exit 1 if [[ \$perli = no ]]; then
perlos=\$(\$perli -e "\$cstr") 2>/dev/null || continue print Cannot find a working Perl interpreter, aborting.
print "Perl interpreter '\$perli' running on '\$perlos'" exit 1
fi
print "Trying Perl interpreter '\$perli'..."
perlos=\$(\$perli -e "\$cstr")
rv=\$?
print "Errorlevel \$rv, running on '\$perlos'"
(( rv )) && continue
[[ -n \$perlos ]] && break [[ -n \$perlos ]] && break
done done
exec \$perli "\${args[@]}" "\$@"$tsts exec \$perli "\${args[@]}" "\$@"$tsts