mklove update: fixes compiles on osx 10.9 (issue #49)

confluentinc · Jun 14, 2014 · 84a12a1 · 84a12a1
1 parent d278f55
commit 84a12a1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/mklove/modules/configure.cc b/mklove/modules/configure.cc
@@ -79,7 +79,19 @@ function checks {
     [[ ! -z $LDFLAGS ]]  && mkl_mkvar_set "LDFLAGS" "LDFLAGS" "$LDFLAGS"
     [[ ! -z $ARFLAGS ]]  && mkl_mkvar_set "ARFLAGS" "ARFLAGS" "$ARFLAGS"
 
-    mkl_mkvar_append CPPFLAGS CPPFLAGS "-g"
+
+    # Add debug symbol flag (-g)
+    # OSX 10.9 requires -gstrict-dwarf for some reason.
+    mkl_meta_set cc_g_dwarf name "debug symbols compiler flag (-g...)"
+    if [[ $MKL_DISTRO == "osx" ]]; then
+	if mkl_compile_check cc_g_dwarf "" cont CC "-gstrict-dwarf"; then
+	    mkl_mkvar_append CPPFLAGS CPPFLAGS "-gstrict-dwarf"
+	else
+	    mkl_mkvar_append CPPFLAGS CPPFLAGS "-g"
+	fi
+    else
+	mkl_mkvar_append CPPFLAGS CPPFLAGS "-g"
+    fi
 
 
     # pkg-config

diff --git a/mklove/modules/configure.good_cflags b/mklove/modules/configure.good_cflags
@@ -10,5 +10,4 @@
 function checks {
     mkl_mkvar_append CPPFLAGS CPPFLAGS \
         "-Wall -Werror -Wfloat-equal -Wpointer-arith"
-    mkl_mkvar_append LDFLAGS LDFLAGS "-g"
 }