Last active
October 6, 2015 10:48
-
-
Save barusan/1f07dcedfe3f6cf1ff61 to your computer and use it in GitHub Desktop.
$ diff -U1 Makefile.OSX-10.{6,11}
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- Makefile.OSX-10.6 2013-07-25 03:27:36.000000000 +0900 | |
+++ Makefile.OSX-10.11 2015-10-06 19:47:39.000000000 +0900 | |
@@ -22,4 +22,4 @@ | |
# need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÉRÔME) | |
-TOOLPATH=/sw/lib/gcc4.5/bin/ | |
-export VERSUFF=-fsf-4.5 | |
+TOOLPATH=/usr/local/bin/ | |
+export VERSUFF=-5 | |
export CXX= $(TOOLPATH)g++$(VERSUFF) | |
@@ -28,3 +28,3 @@ | |
export GJAR= $(TOOLPATH)gjar$(VERSUFF) | |
-export LIBGCJ= /sw/lib/gcc4.5/share/java/libgcj-4.5.0.jar | |
+export LIBGCJ= /usr/local/share/java/libgcj-5.2.0.jar | |
export AR= ar | |
@@ -33,2 +33,5 @@ | |
export RMFLAGS= -vf | |
+export JAVAC= /usr/bin/javac | |
+export JAVAH= /usr/bin/javah | |
+export JAR= /usr/bin/jar | |
@@ -65,8 +68,10 @@ | |
# | |
-export MACOSX_DEPLOYMENT_TARGET= 10.4 | |
-export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers -mmacosx-version-min=10.4 | |
+export MACOSX_DEPLOYMENT_TARGET= 10.11 | |
+export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers -mmacosx-version-min=10.11 | |
export CXXFLAGS= -Wall -Wextra -Weffc++ -O2 | |
export GCJFLAGS= -Wall -fsource=1.3 -O2 | |
+export JAVACFLAGS= -Xlint | |
export GCJHFLAGS= -force | |
-export LDLIBS= /sw/lib/gcc4.5/lib/libgcj.dylib /sw/lib/gcc4.5/lib/libstdc++.dylib /sw/lib/gcc4.5/lib/libgcc_s.1.dylib -liconv -lz | |
+export JAVAHFLAGS= -force | |
+export LDLIBS= /usr/local/Cellar/gcc/5.2.0/lib/gcc/5/libstdc++.dylib /usr/local/Cellar/gcc/5.2.0/lib/gcc/5/libgcc_s.1.dylib -liconv -lz |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment