commit 8bc80ada76144e66f47ca862ced6d03027a8090f from: Russ Cox date: Mon Sep 19 13:17:38 2011 UTC devdraw: handle, warn about Lion R=rsc http://codereview.appspot.com/5069042 commit - a59b2edeb3f9ddfed173c772783774be0cd02cd4 commit + 8bc80ada76144e66f47ca862ced6d03027a8090f blob - 15fc61f90af8ac1554734176bf1d29be5dafa4de blob + 4e587164ed158d90281a6e69ec678e674800fe46 --- src/cmd/devdraw/mkwsysrules.sh +++ src/cmd/devdraw/mkwsysrules.sh @@ -22,7 +22,12 @@ fi if [ "x$WSYSTYPE" = "x" ]; then if [ "x`uname`" = "xDarwin" ]; then - WSYSTYPE=osx + if sw_vers | grep 'ProductVersion: 10\.[0-6]\.' >/dev/null; then + WSYSTYPE=osx + else + echo 1>&2 'WARNING: OS X Lion is not working. Copy binaries from a Snow Leopard system.' + WSYSTYPE=osx-cocoa + fi elif [ -d "$X11" ]; then WSYSTYPE=x11 else @@ -53,6 +58,9 @@ elif [ $WSYSTYPE = osx ]; then fi echo 'WSYSOFILES=$WSYSOFILES osx-screen-carbon-objc.o osx-draw.o osx-srv.o' echo 'MACARGV=install-macargv' +elif [ $WSYSTYPE = osx-cocoa ]; then + echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-objc.o cocoa-srv.o cocoa-thread.o' + echo 'MACARGV=install-macargv' elif [ $WSYSTYPE = nowsys ]; then echo 'WSYSOFILES=nowsys.o' fi