Merge pull request lithiumFlower#6 from lithiumFlower/osx-compatibility

Mac static libstdc++ and statc libgcc

Author: lithiumFlower

Makefile

@@ -18,10 +18,6 @@ ifeq ($(ARCH),x86-linux)
 else
 	UNAME = $(shell uname)
 	ifeq ($(UNAME),Darwin)
-	    STD_LIB = libstdc++.6.dylib
-	    GCC_LIB = libgcc_s.1.dylib
-		STD_LIB_PATH = /usr/local/opt/gcc/lib/gcc/10/$(STD_LIB)
-		GCC_LIB_PATH = /usr/local/lib/gcc/10/$(GCC_LIB)
 		STRIP = strip -x
 		ARCH = i386-x86_64-macosx
 		SOEXT = .dylib
@@ -89,18 +85,7 @@ ifeq ($(WIN),1)
 else
 ifeq ($(UNAME),Darwin)
 	$(STRIP) build/*.dylib
-	cp $(STD_LIB_PATH) build/
-	cp $(GCC_LIB_PATH) build/
 	chmod +xwr build/*.dylib
-	install_name_tool \
-		-change $(STD_LIB_PATH) @rpath/$(STD_LIB) \
-		-change $(GCC_LIB_PATH) @rpath/$(GCC_LIB) \
-		build/libdoctotext.dylib
-	install_name_tool \
-	    -change $(GCC_LIB_PATH) @rpath/$(GCC_LIB) \
-	    build/$(STD_LIB)
-	install_name_tool -id @rpath/$(STD_LIB) build/$(STD_LIB)
-	install_name_tool -id @rpath/$(GCC_LIB) build/$(GCC_LIB)
 	install_name_tool -id @rpath/libdoctotext.dylib build/libdoctotext.dylib
 	echo './doctotext "$$@"' > build/doctotext.sh
 else

README.md

@@ -46,7 +46,8 @@ Install the following through homebrew:
 - doxygen, libffi, libxml2, zlib, xz, gcc
 libffi, libxml2, zlib, and xz will be statically linked through their /usr/local/opt/ -> /usr/local/Cellar/ symlinks
 
-The Makefile will use the full path to GNU g++ 10 (installed through `brew install gcc` at `/usr/local/bin/g++-10`). If you have different version edit the makefile and change the `src/Makefile` `CXX` setting for Darwin, as well as the corresponding main `Makefile` `STD_LIB_PATH` and `GCC_LIB_PATH`.
+The Makefile will use the full path to GNU g++ 10 (installed through `brew install gcc` at `/usr/local/bin/g++-10`). If you have different version edit the makefile and change the `src/Makefile` `CXX` setting for Darwin.  
+  
 
 Note that the system gcc and g++ *will not work*. The system gcc and g++ compile against Mac's `libc++` which is Mac's implementation of a c++11 compatible standard library. Unfortunately because we are linking with precompiled libs distributed by SILVERCODERS which were compiled pre c++11 with GNU g++ we must use GNU g++ for its ability to be abi compatible with pre c++11 libraries linked against the gnu `libstdc++`. Mac removed their GNU compatibility and distributed headers as of Xcode 10.
 

src/Makefile

@@ -60,7 +60,8 @@ else
                    /usr/local/opt/zlib/lib/libz.a \
                    /usr/local/opt/xz/lib/liblzma.a \
                    /usr/lib/libiconv.dylib \
-                   -framework CoreServices
+                   -framework CoreServices \
+			      -static-libgcc -static-libstdc++
     else
         CXX = g++
         STRIP = strip