Merge branch 'master' into dev

2017-03-17 12:37:23 -07:00
parent e3feaf3f5d d5102539dd
commit df30255542
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@@ -11,8 +11,8 @@ ifeq ($(OSTYPE),Linux)
 endif

 ifeq ($(OSTYPE),FreeBSD)
-	CC=gcc
-	CXX=g++
+	CC=clang
+	CXX=clang++
 	ZT_BUILD_PLATFORM=7
 	include make-bsd.mk
 endif