do not use $(uname -s || uname) as TARGET_OS if it’s the same as $(uname -n), to weave around many ancient unicēs; idea discussed with RT

This commit is contained in:
tg 2012-05-04 21:37:08 +00:00
parent 000d0eb653
commit b1aa05e36e
1 changed files with 7 additions and 4 deletions

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.557 2012/05/04 21:34:12 tg Exp $' srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.558 2012/05/04 21:37:08 tg Exp $'
#- #-
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 # 2011, 2012
@ -398,8 +398,11 @@ else
LDFLAGS=$LDSTATIC LDFLAGS=$LDSTATIC
fi fi
test x"$TARGET_OS" = x"" && TARGET_OS=`uname -s 2>/dev/null || uname` if test -z "$TARGET_OS"; then
if test x"$TARGET_OS" = x""; then x=`uname -s 2>/dev/null || uname`
test x"$x" = x"`uname -n 2>/dev/null`" || TARGET_OS=$x
fi
if test -z "$TARGET_OS"; then
echo "$me: Set TARGET_OS, your uname is broken!" >&2 echo "$me: Set TARGET_OS, your uname is broken!" >&2
exit 1 exit 1
fi fi
@ -1398,7 +1401,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.557 2012/05/04 21:34:12 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.558 2012/05/04 21:37:08 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