diff options
| -rwxr-xr-x | .gitignore | 1 | ||||
| -rw-r--r-- | BUILDING.txt | 12 | ||||
| -rw-r--r-- | ext/tap-mac/tuntap/src/tap/Makefile | 4 |
3 files changed, 15 insertions, 2 deletions
@@ -1,4 +1,5 @@ /ext/llvm-g++-Xcode4.6.2 +/ext/llvm-g++-Xcode4.6.2.tar.bz2 /zerotier-* /build-ZeroTierUI-* /ZeroTierUI/*.user diff --git a/BUILDING.txt b/BUILDING.txt index 761a50de..53c9d1a0 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -18,6 +18,18 @@ make -f Makefile.linux Edit Makefile.linux if you want to change between debug or release build. +If you are building ext/tap-mac you will need a different version of the +OSX gcc compiler chain than what currently ships (clang). We've got a copy +available here: + +http://download.zerotier.com/dev/llvm-g++-Xcode4.6.2.tar.bz2 + +Un-tar this into ext/ (it's excluded in .gitignore) and then 'make' in +ext/tap-mac/tuntap/src/tap. + +Most users should not need to build tap-mac, since a binary is included +in ext/bin. + -- Windows Here be dragons. diff --git a/ext/tap-mac/tuntap/src/tap/Makefile b/ext/tap-mac/tuntap/src/tap/Makefile index 58e582da..ee1f5457 100644 --- a/ext/tap-mac/tuntap/src/tap/Makefile +++ b/ext/tap-mac/tuntap/src/tap/Makefile @@ -29,8 +29,8 @@ LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch i386 -arch x86_64 -Xlinker #CCP = g++ #CC = gcc -CCP = $(HOME)/Code/llvm-g++-Xcode4.6.2/bin/llvm-g++ -CC = $(HOME)/Code/llvm-g++-Xcode4.6.2/bin/llvm-gcc +CCP = ../../../../llvm-g++-Xcode4.6.2/bin/llvm-g++ +CC = ../../../../llvm-g++-Xcode4.6.2/bin/llvm-gcc all: $(KMOD_BIN) bundle |