[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild

[Don Lewis]

 solenv/gbuild/Output.mk |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 064e99cea6e96decb0fd508e930580fccb4c33bc
Author: Don Lewis <truckman at apache.org>
Date:   Mon Jan 8 17:12:58 2018 +0000

    Revert the part of r1818099 that changed the hardwired awk command
    
    in main/solenv/gbuild/Output.mk with $(gb_AWK).  Unfortunately
    $(gb_AWK) is not defined at this point, so this change caused
    errors each time a gbuild makefile was invoked.  The definition
    of $(gb_AWK) is in the platform gbuild files, which are included
    after Output.mk.  Changing the order of the includes breaks the
    Windows build due to other chicken vs. egg problems.  Fortunately
    using hardwired awk works everywhere except Solaris, which we no
    longer support.

diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 62acd486201c..0431914b03f3 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -57,8 +57,11 @@ endif
 
 # disable for OS/2
 ifneq ($(OS),OS2)
-gb_Output_ESCAPE := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 27 }' -)
-gb_Output_BELL := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 7 }' -)
+# We can't use $(gb_AWK) here since that is defined in the platform files,
+# which are not included yet.  Reordering the includes causes other
+# problems.  Fortunately hardcoding awk works everywhere except Solaris.
+gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -)
+gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
 endif