From 9201cf62ce9f17793bb6103050c9ba27eb942e57 Mon Sep 17 00:00:00 2001
From: Phillip Lord <phillip.lord@russet.org.uk>
Date: Thu, 25 Apr 2019 15:26:26 +0100
Subject: [PATCH] No longer add debug symbols to release build

* admin/nt/dist-build/build-zips.sh: Remove -g3 from release build and
  install with install-strip
---
 admin/nt/dist-build/build-zips.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh
index 4404c779629..cff6fdec3e0 100755
--- a/admin/nt/dist-build/build-zips.sh
+++ b/admin/nt/dist-build/build-zips.sh
@@ -58,10 +58,10 @@ function build_zip {
             --without-dbus \
             --host=$HOST --without-compress-install \
             $CACHE \
-            CFLAGS="-O2 -static -g3"
+            CFLAGS="$CFLAGS"
     fi
 
-    make -j 2 install \
+    make -j 4 $INSTALL_TARGET \
          prefix=$HOME/emacs-build/install/emacs-$VERSION/$ARCH
     cd $HOME/emacs-build/install/emacs-$VERSION/$ARCH
     cp $HOME/emacs-build/deps/libXpm/$ARCH/libXpm-noX4.dll bin
@@ -107,6 +107,8 @@ BUILD_32=1
 BUILD_64=1
 GIT_UP=0
 CONFIG=1
+CFLAGS="-O2 -static"
+INSTALL_TARGET="install-strip"
 
 while getopts "36gb:hnsiV:" opt; do
   case $opt in
@@ -141,6 +143,8 @@ while getopts "36gb:hnsiV:" opt; do
         ;;
     s)
         SNAPSHOT="-snapshot"
+        CFLAGS="-O2 -static -g3"
+        INSTALL_TARGET="install"
         ;;
     h)
         echo "build-zips.sh"
@@ -200,6 +204,8 @@ else
     OF_VERSION="$VERSION-`date +%Y-%m-%d`"
     ## Use snapshot dependencies
     SNAPSHOT=1
+    CFLAGS="-O2 -static -g3"
+    INSTALL_TARGET="install"
 fi
 
 if (($GIT_UP))
-- 
2.39.2