diff --git a/Makefile b/Makefile
index ec476ad7dc7..73ceb026542 100644
--- a/Makefile
+++ b/Makefile
@@ -336,7 +336,7 @@ CXXFLAGS += -stdlib=libc++
 endif
 CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations
 COREFLAGS += -fno-rtti -fno-exceptions
-LDFLAGS += -g
+LDFLAGS += -g $(if $(subst Darwin,,$(SYSTEM)),,-framework CoreFoundation)
 
 DEFINES += PB_FIELD_16BIT
 
diff --git a/build.yaml b/build.yaml
index ae0a1246bad..d8977d40c3e 100644
--- a/build.yaml
+++ b/build.yaml
@@ -5524,7 +5524,7 @@ defaults:
     COREFLAGS: -fno-rtti -fno-exceptions
     CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1
       -Wno-deprecated-declarations
-    LDFLAGS: -g
+    LDFLAGS: -g $(if $(subst Darwin,,$(SYSTEM)),,-framework CoreFoundation)
   zlib:
     CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration
       -Wno-implicit-fallthrough $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden
diff --git a/grpc.gyp b/grpc.gyp
index f5d7181e5b6..d5c577d507b 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -62,6 +62,10 @@
     ],
     'ldflags': [
       '-g',
+      '$(if',
+      '$(subst',
+      'Darwin,,$(SYSTEM)),,-framework',
+      'CoreFoundation)',
     ],
     'cflags_c': [
       '-Werror',