Fix so that AR/AROPTIONS can be overridden on the configure command line when
using Sun CC. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -601,9 +601,9 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
|
||||
dnl Sun C++ compiler requires special way of creating static libs;
|
||||
dnl see here for more details:
|
||||
dnl https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1229751&group_id=9863
|
||||
AR=$CXX
|
||||
AR=${AR:-"$CXX"}
|
||||
AC_SUBST(AR)
|
||||
AROPTIONS="-xar -o"
|
||||
AROPTIONS=${AROPTIONS:-"-xar -o"}
|
||||
else
|
||||
AC_CHECK_TOOL(AR, ar, ar)
|
||||
AROPTIONS=rcu
|
||||
|
6
configure
vendored
6
configure
vendored
@@ -15219,6 +15219,7 @@ else
|
||||
fi
|
||||
|
||||
|
||||
if test "x$SUNCXX" != xyes; then
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}ar; ac_word=$2
|
||||
@@ -15303,6 +15304,7 @@ if test "x$AR" = "x" ; then
|
||||
echo "$as_me: error: ar is needed to build wxWidgets" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
fi
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
# so one script is as good as another. But avoid the broken or
|
||||
@@ -47931,9 +47933,9 @@ fi
|
||||
|
||||
|
||||
if test "x$SUNCXX" = "xyes"; then
|
||||
AR=$CXX
|
||||
AR=${AR:-"$CXX"}
|
||||
|
||||
AROPTIONS="-xar -o"
|
||||
AROPTIONS=${AROPTIONS:-"-xar -o"}
|
||||
else
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
|
||||
|
@@ -1465,10 +1465,14 @@ AC_PROG_RANLIB
|
||||
|
||||
dnl ar command
|
||||
dnl defines AR with the appropriate command
|
||||
dnl
|
||||
dnl For Sun CC AC_BAKEFILE below sets AR to the compiler itself.
|
||||
if test "x$SUNCXX" != xyes; then
|
||||
AC_CHECK_TOOL(AR, ar)
|
||||
if test "x$AR" = "x" ; then
|
||||
AC_MSG_ERROR([ar is needed to build wxWidgets])
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl install checks
|
||||
dnl defines INSTALL with the appropriate command
|
||||
|
Reference in New Issue
Block a user