diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-07-08 17:49:51 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-08-10 18:07:07 +0200 |
| commit | 8e5525be56447239f2322f0acadd057314ae6677 (patch) | |
| tree | 6f6850c6aeb8d68e32c627f5b43654ab3aff9799 | |
| parent | f4c63f8491d442af32063eca90e7b537a09bf1a9 (diff) | |
Get rid of odd ENABLE_SYMBOLS=FALSE
* None of the other ENABLE_* support anything but TRUE or empty.
* Other checks for -n "$ENABLE_SYMBOLS" in configure.ac are confused by it.
* solenv/gbuild/gbuild.help.txt talks about "If not empty", not mentioning "FALSE".
* A missing (redundant) explicit --disable-symbols left gb_SYMBOL uninitialized
(instead of setting it to $(false))---but without consequences, as all the places
checking gb_SYMBOL explicitly check for $(true).
Change-Id: Id004189de27a7936862dab3a5fd84d549c06af2b
Reviewed-on: https://gerrit.libreoffice.org/27057
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 436ee0989d1bc321886fac5a3507fc1d16650abd)
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 67a25ac49ed6..71775caff9df 100644 --- a/configure.ac +++ b/configure.ac @@ -4023,11 +4023,7 @@ if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then fi AC_MSG_RESULT([yes]) else - if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then - ENABLE_SYMBOLS="FALSE" - else - ENABLE_SYMBOLS= - fi + ENABLE_SYMBOLS= AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_SYMBOLS) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 04056cd136c8..168a205cb63b 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -117,12 +117,10 @@ gb_Deliver_HARDLINK := $(true) endif # note: ENABLE_CRASHDUMP turns on gb_SYMBOL -ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE) -gb_SYMBOL := $(false) -else ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),) gb_SYMBOL := $(true) -endif +else +gb_SYMBOL := $(false) endif ifneq ($(strip $(ENABLE_PCH)),) |