diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-07-08 17:49:51 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-07-11 08:57:44 +0000 |
commit | 436ee0989d1bc321886fac5a3507fc1d16650abd (patch) | |
tree | 03509d40005d7a21559a4f578fe0082e5df56827 /solenv | |
parent | bccb43027e8198ef6b112dd7632d0782a23b557e (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>
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/gbuild.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 69e370761884..815465dbd8d9 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)),) |