diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec
index 0f0fe1973b8..13a0a85b2ba 100644
--- a/FirebaseFirestore.podspec
+++ b/FirebaseFirestore.podspec
@@ -35,7 +35,6 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
     'Firestore/core/include/**/*.{h,cc,mm}',
     'Firestore/core/src/**/*.{h,cc,mm}',
     'Firestore/third_party/Immutable/*.[mh]',
-    'Firestore/third_party/abseil-cpp/**/*.{h,cc}'
   ]
   s.requires_arc = [
     'Firestore/Source/**/*',
@@ -45,7 +44,6 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
   s.exclude_files = [
     'Firestore/Port/*test.cc',
     'Firestore/third_party/Immutable/Tests/**',
-    'Firestore/third_party/abseil-cpp/**/*_test.{h,cc}',
 
     # Exclude alternate implementations for other platforms
     'Firestore/core/src/firebase/firestore/util/assert_stdio.cc',
@@ -79,4 +77,19 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
         Firestore/core/src/firebase/firestore/util/config.h.in > \
         Firestore/core/src/firebase/firestore/util/config.h
   CMD
+
+  s.subspec 'abseil-cpp' do |ss|
+    ss.preserve_path = [
+      'Firestore/third_party/abseil-cpp/absl'
+    ]
+    ss.source_files = [
+      'Firestore/third_party/abseil-cpp/**/*.cc'
+    ]
+    ss.exclude_files = [
+      'Firestore/third_party/abseil-cpp/**/*_test.cc',
+    ]
+
+    ss.library = 'c++'
+    ss.compiler_flags = '$(inherited) ' + '-Wno-comma'
+  end
 end
diff --git a/cmake/CompilerSetup.cmake b/cmake/CompilerSetup.cmake
index aa4289ac541..b5600279d8e 100644
--- a/cmake/CompilerSetup.cmake
+++ b/cmake/CompilerSetup.cmake
@@ -61,6 +61,9 @@ if(CLANG OR GNU)
       APPEND common_flags
      -Wconditional-uninitialized -Werror=return-type -Winfinite-recursion -Wmove
      -Wrange-loop-analysis -Wunreachable-code
+
+     # Options added to match apple recommended project settings
+     -Wcomma
     )
   endif()