mirror of
https://github.com/paboyle/Grid.git
synced 2025-04-10 14:10:46 +01:00
resolved merge conflict
This commit is contained in:
commit
345721220e
@ -288,9 +288,7 @@ case ${CXX} in
|
||||
;;
|
||||
*)
|
||||
CXXLD=${CXX}
|
||||
#
|
||||
CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
|
||||
#CXXFLAGS="$CXXFLAGS"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -632,4 +630,3 @@ AC_OUTPUT
|
||||
echo ""
|
||||
cat grid.configure.summary
|
||||
echo ""
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user