diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-01-12 20:42:38 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-01-12 20:43:53 +0100 |
| commit | e0be5756748f87b4cbccf8326c983aeeec98adba (patch) | |
| tree | e81e1e7bd3d668a10cb698a74d486bbfbb12c147 | |
| parent | 53d492eb9170ecdc5925e26adb63fb3f6a241191 (diff) | |
Move CC/CXX saving to a safe place
AC_CHECK_LIB, AC_CHECK_HEADER etc tend to touch CC, so better
move saving of that var to an earlier part of configure
| -rwxr-xr-x | configure.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 3200accaca0f..c4982cb7c052 100755 --- a/configure.in +++ b/configure.in @@ -1313,6 +1313,9 @@ if test "$EUID" -eq "0" -a "z`uname -o 2>/dev/null`" = "zCygwin" ; then AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an administrative account]) fi +save_CC=$CC +save_CXX=$CXX + AC_PROG_EGREP AC_PROG_AWK AC_PATH_PROG( AWK, $AWK) @@ -1877,9 +1880,6 @@ fi AC_MSG_RESULT($GCC_HOME) AC_SUBST(GCC_HOME) -save_CC=$CC -save_CXX=$CXX - if test "$GCC_HOME_SET" = "true" ; then if test -z "$CC"; then CC="$GCC_HOME/bin/gcc" |