configure.ac | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit ca1ad45e82f8822c048d8161c85e191e4c923961
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jan 30 12:05:45 2019 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Wed Jan 30 16:26:13 2019 +0100
Avoid CFLAGS being set by accident
When no CFLAGS are passed into autogen.sh,
f104b3cafee63b47a735cfdce0f05dab2eedbb91 "tdf#72987 run firebird test for
little
endian only for now" (introducing AC_C_BIGENDIAN before AC_PROG_CC) caused
CFLAGS in config_host.mk to accidentally be set to -g -O2 (instead of being
left
undefined).
Change-Id: I639ce74b468e7fb25a6bda97346c7f97d6b829aa
Reviewed-on: https://gerrit.libreoffice.org/67125
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit fcb08e31ee0635fe61338246a57e926c11890ac7)
Reviewed-on: https://gerrit.libreoffice.org/67135
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/configure.ac b/configure.ac
index 3e0fc099692f..a208887fb3c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -812,13 +812,6 @@ haiku*)
;;
esac
-if test "$_os" != "WINNT"; then
-AC_C_BIGENDIAN([ENDIANNESS=big], [ENDIANNESS=little])
-else
-ENDIANNESS=little
-fi
-AC_SUBST(ENDIANNESS)
-
if test "$_os" = "Android" ; then
# Verify that the NDK and SDK options are proper
if test -z "$with_android_ndk"; then
@@ -934,7 +927,7 @@ my_original_CXXFLAGS=$CXXFLAGS
my_original_CPPFLAGS=$CPPFLAGS
dnl The following checks for gcc, cc and then cl (if it weren't guarded for
win32)
-dnl Needs to precede the AC_SEARCH_LIBS call below, which apparently calls
+dnl Needs to precede the AC_C_BIGENDIAN and AC_SEARCH_LIBS calls below, which
apparently call
dnl AC_PROG_CC internally.
if test "$_os" != "WINNT"; then
# AC_PROG_CC sets CFLAGS to -g -O2 if not set, avoid that
@@ -943,6 +936,13 @@ if test "$_os" != "WINNT"; then
CFLAGS=$save_CFLAGS
fi
+if test "$_os" != "WINNT"; then
+AC_C_BIGENDIAN([ENDIANNESS=big], [ENDIANNESS=little])
+else
+ENDIANNESS=little
+fi
+AC_SUBST(ENDIANNESS)
+
if test $_os != "WINNT"; then
save_LIBS="$LIBS"
AC_SEARCH_LIBS([dlsym], [dl],
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
