Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/2.x' into 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
back-2-95 committed Aug 26, 2020
2 parents 1289e32 + eedc0d4 commit cc2ba67
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion make/os.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ UNAME := $(shell uname | tr A-Z a-z)
ifeq ($(UNAME),darwin)
OS_ID := macos
OS_VERSION := $(shell sw_vers -productVersion | cut -c1-5)
ifeq ($(OS_VERSION),10.15)
ifeq ($(OS_VERSION),11.0)
OS := macOS Big Sur
else ifeq ($(OS_VERSION),10.15)
OS := macOS Catalina
else ifeq ($(OS_VERSION),10.14)
OS := macOS Mojave
Expand Down

0 comments on commit cc2ba67

Please sign in to comment.