Merge "BuildSystem: Enable ./configure in Solaris 11."

This commit is contained in:
George Joseph 2018-06-22 09:22:11 -05:00 committed by Gerrit Code Review
commit 3fee11f261
2 changed files with 4 additions and 4 deletions

View File

@ -33,11 +33,11 @@ AC_DEFUN([AST_CHECK_RAII], [
AST_C_COMPILER_FAMILY="gcc"
],[
AC_MSG_CHECKING(for clang -fblocks)
if test "`echo "int main(){return ^{return 42;}();}" | ${CC} -o /dev/null -fblocks -x c - 2>&1`" = ""; then
if test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c - 2>&1`" = ""; then
AST_CLANG_BLOCKS_LIBS=""
AST_CLANG_BLOCKS="-Wno-unknown-warning-option -fblocks"
AC_MSG_RESULT(yes)
elif test "`echo "int main(){return ^{return 42;}();}" | ${CC} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then
elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then
AST_CLANG_BLOCKS_LIBS="-lBlocksRuntime"
AST_CLANG_BLOCKS="-fblocks"
AC_MSG_RESULT(yes)

4
configure vendored
View File

@ -9063,12 +9063,12 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang -fblocks" >&5
$as_echo_n "checking for clang -fblocks... " >&6; }
if test "`echo "int main(){return ^{return 42;}();}" | ${CC} -o /dev/null -fblocks -x c - 2>&1`" = ""; then
if test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c - 2>&1`" = ""; then
AST_CLANG_BLOCKS_LIBS=""
AST_CLANG_BLOCKS="-Wno-unknown-warning-option -fblocks"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
elif test "`echo "int main(){return ^{return 42;}();}" | ${CC} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then
elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then
AST_CLANG_BLOCKS_LIBS="-lBlocksRuntime"
AST_CLANG_BLOCKS="-fblocks"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5