diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69117a721..4c6c46dec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,7 +238,7 @@ endif()
 set_target_properties(${OpenBLAS_LIBS} PROPERTIES OUTPUT_NAME ${OpenBLAS_LIBNAME})
 
 # Android needs to explicitly link against libm
-if(ANDROID)
+if (${CMAKE_SYSTEM_NAME} MATCHES "AIX|Android|Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|Darwin")
   if(BUILD_STATIC_LIBS)
     target_link_libraries(${OpenBLAS_LIBNAME}_static m)
   endif()
diff --git a/cmake/fc.cmake b/cmake/fc.cmake
index 773feca6f..e615e148e 100644
--- a/cmake/fc.cmake
+++ b/cmake/fc.cmake
@@ -46,7 +46,7 @@ if (${F_COMPILER} STREQUAL "GFORTRAN")
   set(FCOMMON_OPT "${FCOMMON_OPT} -fno-optimize-sibling-calls")
   #Don't include -lgfortran, when NO_LAPACK=1 or lsbcc
   if (NOT NO_LAPACK)
-    set(EXTRALIB "{EXTRALIB} -lgfortran")
+    set(EXTRALIB "${EXTRALIB} -lgfortran")
   endif ()
   if (NO_BINARY_MODE)
     if (MIPS64)