diff --git a/Makefile.system b/Makefile.system
index 201d1e23d..65294b906 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -23,7 +23,7 @@ CC = gcc
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
      CC = clang
-     EXTRALIB += -Wl,-no_compact_unwind
+#     EXTRALIB += -Wl,-no_compact_unwind
 endif
 endif
 
@@ -558,9 +558,6 @@ FCOMMON_OPT += -Wall
 #Don't include -lgfortran, when NO_LAPACK=1 or lsbcc
 ifneq ($(NO_LAPACK), 1)
 EXTRALIB += -lgfortran
-ifeq ($(UNAME_S),Darwin)
-EXTRALIB += -L/usr/local/lib/gcc/4.9/
-endif
 endif
 ifdef NO_BINARY_MODE
 ifeq ($(ARCH), mips64)
diff --git a/f_check b/f_check
index 5719faff1..7c6cc78ae 100644
--- a/f_check
+++ b/f_check
@@ -38,6 +38,7 @@ OUTER:
         foreach $path (@path) {
             if (-x $path . "/" . $lists) {
                 $compiler = $lists;
+                $compiler_bin = $lists;
                 last OUTER;
             }
         }