grpc-swift needs zlib (google#6402)

* grpc-swift needs zlib * swift: do not use CFLAGS for coverage
gstrauss · Sep 5, 2021 · 9f4b295 · 9f4b295
1 parent 0b49925
commit 9f4b295
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/infra/base-images/base-builder-swift/precompile_swift b/infra/base-images/base-builder-swift/precompile_swift
@@ -23,12 +23,11 @@ then
     export SWIFTFLAGS="$SWIFTFLAGS -Xswiftc -profile-generate -Xswiftc -profile-coverage-mapping -Xswiftc -sanitize=fuzzer"
 else
     export SWIFTFLAGS="$SWIFTFLAGS -Xswiftc -sanitize=fuzzer,$SANITIZER --sanitize=$SANITIZER"
-fi
-
-for f in $CFLAGS; do
-    export SWIFTFLAGS="$SWIFTFLAGS -Xcc=$f"
-done
+    for f in $CFLAGS; do
+        export SWIFTFLAGS="$SWIFTFLAGS -Xcc=$f"
+    done
 
-for f in $CXXFLAGS; do
-    export SWIFTFLAGS="$SWIFTFLAGS -Xcxx=$f"
-done
+    for f in $CXXFLAGS; do
+        export SWIFTFLAGS="$SWIFTFLAGS -Xcxx=$f"
+    done
+fi
diff --git a/projects/grpc-swift/Dockerfile b/projects/grpc-swift/Dockerfile
@@ -17,6 +17,7 @@
 FROM gcr.io/oss-fuzz-base/base-builder-swift
 
 # specific to project
+RUN apt-get update && apt-get install -y zlib1g-dev
 RUN git clone --depth 1 https://github.com/grpc/grpc-swift
 COPY build.sh $SRC
 WORKDIR $SRC/grpc-swift