diff --git a/config.m4 b/config.m4
index 4a8651dae38..efa86576f84 100644
--- a/config.m4
+++ b/config.m4
@@ -33,6 +33,8 @@ if test "$PHP_GRPC" != "no"; then
       ;;
   esac
 
+  PHP_SUBST(GRPC_SHARED_LIBADD)
+
   PHP_NEW_EXTENSION(grpc,
     src/php/ext/grpc/byte_buffer.c \
     src/php/ext/grpc/call.c \
diff --git a/src/php/ext/grpc/config.m4 b/src/php/ext/grpc/config.m4
index 1af93ceecad..ed62dee71cc 100755
--- a/src/php/ext/grpc/config.m4
+++ b/src/php/ext/grpc/config.m4
@@ -42,14 +42,15 @@ if test "$PHP_GRPC" != "no"; then
   dnl  PHP_ADD_LIBRARY(pthread,,GRPC_SHARED_LIBADD)
   GRPC_SHARED_LIBADD="-lpthread $GRPC_SHARED_LIBADD"
   PHP_ADD_LIBRARY(pthread)
-  PHP_ADD_LIBRARY(stdc++,,GRPC_SHARED_LIBADD)
-  PHP_ADD_LIBRARY(stdc++)
   PHP_ADD_LIBRARY(dl,,GRPC_SHARED_LIBADD)
   PHP_ADD_LIBRARY(dl)
 
   case $host in
-    *darwin*) ;;
+    *darwin*) 
+      PHP_ADD_LIBRARY(c++,1,GRPC_SHARED_LIBADD)
+      ;;
     *)
+      PHP_ADD_LIBRARY(stdc++,1,GRPC_SHARED_LIBADD)
       PHP_ADD_LIBRARY(rt,,GRPC_SHARED_LIBADD)
       PHP_ADD_LIBRARY(rt)
       ;;
diff --git a/templates/config.m4.template b/templates/config.m4.template
index f13ac75914f..edb6a99dc67 100644
--- a/templates/config.m4.template
+++ b/templates/config.m4.template
@@ -35,6 +35,8 @@
         ;;
     esac
 
+    PHP_SUBST(GRPC_SHARED_LIBADD)
+
     PHP_NEW_EXTENSION(grpc,
       % for source in php_config_m4.src:
       ${source} ${"\\"}