Kaydet (Commit) b592b3e8 authored tarafından Douglas Mencken's avatar Douglas Mencken Kaydeden (comit) Caolán McNamara

drop -Wno-long-double compiler flag

new GCC compilers do not accept "obsolete and totally removed
in gcc 4.2 and later" -Wno-long-double flag

actually, it used to be Apple-only GCC extension for gcc<=3.3

Change-Id: Ied3320cbd45915682b628c99bb0a168ea4753bb7
Reviewed-on: https://gerrit.libreoffice.org/11819Reviewed-by: 's avatarDouglas Mencken <dougmencken@gmail.com>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 7dc6c9af
......@@ -248,7 +248,6 @@ export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@
export HAVE_GCC_FNO_INLINE=@HAVE_GCC_FNO_INLINE@
export HAVE_GCC_GGDB2=@HAVE_GCC_GGDB2@
export HAVE_GCC_NO_LONG_DOUBLE=@HAVE_GCC_NO_LONG_DOUBLE@
export HAVE_GCC_PRAGMA_OPERATOR=@HAVE_GCC_PRAGMA_OPERATOR@
export HAVE_GCC_VISIBILITY_BROKEN=@HAVE_GCC_VISIBILITY_BROKEN@
export HAVE_GCC_VISIBILITY_FEATURE=@HAVE_GCC_VISIBILITY_FEATURE@
......
......@@ -5748,17 +5748,6 @@ if test "$GCC" = "yes"; then
AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([whether $CC supports -Wno-long-double])
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Werror -Wno-long-double"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_NO_LONG_DOUBLE=TRUE ],[])
CFLAGS=$save_CFLAGS
if test "$HAVE_GCC_NO_LONG_DOUBLE" = "TRUE"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([whether $CC supports -mno-avx])
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Werror -mno-avx"
......@@ -5862,7 +5851,6 @@ if test "$GCC" = "yes"; then
AC_LANG_POP([C++])
fi
AC_SUBST(HAVE_GCC_NO_LONG_DOUBLE)
AC_SUBST(HAVE_GCC_AVX)
AC_SUBST(HAVE_GCC_BUILTIN_ATOMIC)
......
......@@ -55,8 +55,8 @@
rm *.o 2>/dev/null
--- misc/build/lp_solve_5.5/lpsolve55/ccc.osx.orig Thu Jun 23 22:53:08 2005
+++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Sun May 22 11:19:48 2011
@@ -1,23 +1,36 @@
+++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx
@@ -1,23 +1,31 @@
src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
+c=$CC
......@@ -78,12 +78,7 @@
fi
-opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
+if [ "$HAVE_GCC_NO_LONG_DOUBLE" = "YES" ] ; then
+ opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
+else
+ opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
+fi
+
+opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+$c $extra_cflags -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $extra_cdefs $src
......
......@@ -57,10 +57,6 @@ gb_CXXFLAGS := \
#-Wshadow \ break in compiler headers already
#-fsigned-char \ might be removed?
ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE)
gb_CXXFLAGS += -Wno-long-double
endif
# these are to get g++ to switch to Objective-C++ mode
# (see toolkit module for a case where it is necessary to do it this way)
gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment