Raymond Toy pushed to branch issue-446-use-cc-to-get-errno at cmucl / cmucl

Commits:

1 changed file:

Changes:

  • bin/create-errno.sh
    ... ... @@ -56,17 +56,15 @@ ERRNO_FILE="bin/errno-default.lisp"
    56 56
     # support code.
    
    57 57
     TEMPLATE="bin/errno-template.lisp"
    
    58 58
     
    
    59
    -# Set ERRNO_HEADERS to the files where we can find errno definitions.
    
    59
    +# Set ERRNO_FILE to an OS-specific name if possible.  If not, use the
    
    60
    +# default ERRNO_FILE value.
    
    60 61
     if [ -z "$DEFAULT" ]; then
    
    61 62
         case $(uname -s) in
    
    62
    -	Linux) ERRNO_HEADERS=/usr/include/asm-generic/errno*.h
    
    63
    -	       ERRNO_FILE="bin/errno-linux.lisp"
    
    63
    +	Linux) ERRNO_FILE="bin/errno-linux.lisp"
    
    64 64
     	       ;;
    
    65
    -	Darwin) ERRNO_HEADERS=/usr/include/sys/errno.h
    
    66
    -		ERRNO_FILE="bin/errno-darwin.lisp"
    
    65
    +	Darwin) ERRNO_FILE="bin/errno-darwin.lisp"
    
    67 66
     		;;
    
    68
    -	SunOS) ERRNO_HEADERS=/usr/include/sys/errno.h
    
    69
    -	       ERRNO_FILE="bin/errno-solaris.lisp"
    
    67
    +	SunOS) ERRNO_FILE="bin/errno-solaris.lisp"
    
    70 68
     	       ;;
    
    71 69
     	*) # The default case where we use the defaults.  But also disable updating.
    
    72 70
     	    UPDATE=""
    
    ... ... @@ -94,7 +92,7 @@ if [ "$UPDATE" = "yes" ]; then
    94 92
        exit 0
    
    95 93
     fi
    
    96 94
     
    
    97
    -if [ -z "$DEFAULT" -a -n "$ERRNO_FILE" ]; then
    
    95
    +if [ -z "$DEFAULT" ] && [ -n "$ERRNO_FILE" ]; then
    
    98 96
         # First check that the errno definitions haven't changed.  If they
    
    99 97
         # have, exit with an error.
    
    100 98