diff options
| author | Russ Cox <rsc@swtch.com> | 2020-01-08 19:49:33 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2020-01-13 16:46:14 -0500 |
| commit | f177c0ba18193fb89ad1b5d84eac2906e8c3b4f1 (patch) | |
| tree | 4381b9ddfdaa1f41c3411902d8996c5a635bf78e /src/cmd/devdraw/mkwsysrules.sh | |
| parent | cc3d97d52a72d7eaceb5b636bcdf81c3e19f7a2e (diff) | |
| download | plan9port-f177c0ba18193fb89ad1b5d84eac2906e8c3b4f1.tar.gz plan9port-f177c0ba18193fb89ad1b5d84eac2906e8c3b4f1.tar.bz2 plan9port-f177c0ba18193fb89ad1b5d84eac2906e8c3b4f1.zip | |
devdraw: drop pre-metal macOS support
We didn't start using Metal until macOS 10.14,
but it was available on 10.13, which is currently
the oldest Apple-supported version of macOS.
Simplify by deleting the old code.
Diffstat (limited to 'src/cmd/devdraw/mkwsysrules.sh')
| -rw-r--r-- | src/cmd/devdraw/mkwsysrules.sh | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh index e94afbd3..a1dc56d3 100644 --- a/src/cmd/devdraw/mkwsysrules.sh +++ b/src/cmd/devdraw/mkwsysrules.sh @@ -22,13 +22,11 @@ fi if [ "x$WSYSTYPE" = "x" ]; then if [ "x`uname`" = "xDarwin" ]; then - if sw_vers | grep 'ProductVersion: 10\.[0-5]\.' >/dev/null; then - echo 1>&2 'OS X 10.5 and older are not supported' + if sw_vers | egrep 'ProductVersion: (10\.[0-9]\.|10\.1[012])$' >/dev/null; then + echo 1>&2 'OS X 10.12 and older are not supported' exit 1 - else - #echo 1>&2 'WARNING: OS X Lion is not working. Copy binaries from a Snow Leopard system.' - WSYSTYPE=osx-cocoa fi + WSYSTYPE=osx-cocoa elif [ -d "$X11" ]; then WSYSTYPE=x11 else @@ -54,12 +52,8 @@ if [ $WSYSTYPE = x11 ]; then XO=`ls x11-*.c 2>/dev/null | sed 's/\.c$/.o/'` echo 'WSYSOFILES=$WSYSOFILES '$XO elif [ $WSYSTYPE = osx-cocoa ]; then - if sw_vers|awk '/ProductVersion/{split($2,a,".");exit(a[2]<14)}' >/dev/null; then # 0 is true in sh. - echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc' - echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-metal-objc.o cocoa-srv.o cocoa-thread.o' - else - echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-objc.o cocoa-srv.o cocoa-thread.o' - fi + echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc' + echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-metal-objc.o cocoa-srv.o cocoa-thread.o' echo 'MACARGV=macargv-objc.o' elif [ $WSYSTYPE = nowsys ]; then echo 'WSYSOFILES=nowsys.o' |