From 80c4b7e97ba90b0280255fc3967f02e02239653c Mon Sep 17 00:00:00 2001 From: Jeff Kaufman Date: Wed, 14 Dec 2016 10:13:45 -0500 Subject: [PATCH] config: use Release binaries when building with --with-debug if that's all that's available (#1332) * config: use Release binaries when building with --with-debug if that's all that's available * prompt the user before going ahead and using release binaries * exit 1, reword message --- config | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/config b/config index 2efec199d..b63f73089 100644 --- a/config +++ b/config @@ -77,6 +77,8 @@ fi if [ "$NGX_DEBUG" = "YES" ]; then buildtype=Debug + # If we're using a psol tarball that doesn't contain Debug/ (which is the case + # from 1.12 onward) then this will be overriden to buildtype=Release below. else buildtype=Release fi @@ -144,6 +146,22 @@ if [ "$psol_binary" = "unset" ] ; then psol_binary="\ $mod_pagespeed_dir/pagespeed/automatic/pagespeed_automatic.a" else + if ! [ -d "$ngx_addon_dir/psol/lib/$buildtype" ]; then + echo " +You have set --with-debug for building nginx, but precompiled Debug binaries for +PSOL, which ngx_pagespeed depends on, aren't available. If you're trying to +debug PSOL you need to build it from source. If you just want to run nginx with +debug-level logging you can use the Release binaries." + echo -n " +Use the available Release binaries?" + read -p " [Y/n] " yn + if [[ "$yn" == N* || "$yn" == n* ]]; then + echo "Cancelled." + exit 1 + fi + + buildtype=Release + fi psol_library_dir="$ngx_addon_dir/psol/lib/$buildtype/$os_name/$arch_name" psol_binary="$psol_library_dir/pagespeed_automatic.a" fi