[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in

[Don Lewis]

 set_soenv.in |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 90ffe9bd128c98e558205d0699a2af8934c99da7
Author: Don Lewis <truckman at apache.org>
Date:   Wed Dec 13 00:17:48 2017 +0000

    Unset $debug in the environment if configured without --enable-debug.
    
    Without this, once you pass --enable-debug to configure, you will
    continue to get debug builds after disabling debug unless you restart
    the shell.
    
    Similarly, unset $EXTERNAL_WARNINGS_NOT_ERRORS if configure is run with
    --enable-werror.

diff --git a/set_soenv.in b/set_soenv.in
index b7184d24e313..6ec61c6be3c2 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1613,9 +1613,13 @@ ToFile( "NO_BSYMBOLIC",      $NO_BSYMBOLIC,      "e" );
 ToFile( "TF_FILTER",         "TRUE",             "e" );
 if ("@ENABLE_DEBUG@" eq "TRUE") {
 ToFile( "debug",             "true",             "e" );
+} else {
+ToFile( "debug",             "",                 "e" );
 }
 if ("@ENABLE_WERROR@" eq "FALSE") {
 ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE",  "e" );
+} else {
+ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "",      "e" );
 }
 ToFile( "PRODUCT",           "@PRODUCT@",        "e" );
 ToFile( "PROFULLSWITCH",     "@PROFULLSWITCH@",  "e" );