From 8ea38263ec1ea18e850ed55124167c2f60875751 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Thu, 15 Oct 2020 11:22:08 -0700
Subject: [PATCH] Put NDEBUG in upb, not in CFLAGS.

---
 php/ext/google/protobuf/php-upb.h | 2 ++
 php/tests/compile_extension.sh    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h
index 6efacd0fd3..e76330eecb 100644
--- a/php/ext/google/protobuf/php-upb.h
+++ b/php/ext/google/protobuf/php-upb.h
@@ -1,3 +1,5 @@
+#define NDEBUG
+
 /* Amalgamated source file */
 #include <stdint.h>/*
 * This is where we define macros used across upb.
diff --git a/php/tests/compile_extension.sh b/php/tests/compile_extension.sh
index daa6b17809..d6dcabcbbb 100755
--- a/php/tests/compile_extension.sh
+++ b/php/tests/compile_extension.sh
@@ -10,7 +10,7 @@ rm -f configure.in configure.ac
 php make-preload.php
 phpize
 if [ "$1" = "--release" ]; then
-  ./configure --with-php-config=$(which php-config) CFLAGS="-DNDEBUG"
+  ./configure --with-php-config=$(which php-config)
 else
   # To get debugging symbols in PHP itself, build PHP with:
   #   $ ./configure --enable-debug CFLAGS='-g -O0'