Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix so that AR/AROPTIONS can be overridden on the configure command line when

Browse Source 
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:
Michael Wetherell
2006-12-09 23:43:54 +00:00
parent e3a10e0c62
commit d083d20168
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/aclocal/bakefile.m4
View File

@@ -601,9 +601,9 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
dnl Sun C++ compiler requires special way of creating static libs; dnl Sun C++ compiler requires special way of creating static libs;
dnl see here for more details: dnl see here for more details:
dnl https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1229751&group_id=9863 dnl https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1229751&group_id=9863
AR=$CXX AR=${AR:-"$CXX"}
AC_SUBST(AR) AC_SUBST(AR)
AROPTIONS="-xar -o" AROPTIONS=${AROPTIONS:-"-xar -o"}
else else
AC_CHECK_TOOL(AR, ar, ar) AC_CHECK_TOOL(AR, ar, ar)
AROPTIONS=rcu AROPTIONS=rcu

12
configure vendored
View File

@@ -15219,7 +15219,8 @@ else
fi fi
if test -n "$ac_tool_prefix"; then 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. # 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 set dummy ${ac_tool_prefix}ar; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -15298,10 +15299,11 @@ else
AR="$ac_cv_prog_AR" AR="$ac_cv_prog_AR"
fi fi
if test "x$AR" = "x" ; then if test "x$AR" = "x" ; then
{ { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5 { { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5
echo "$as_me: error: ar is needed to build wxWidgets" >&2;} echo "$as_me: error: ar is needed to build wxWidgets" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi
fi fi
# Find a good install program. We prefer a C program (faster), # Find a good install program. We prefer a C program (faster),
@@ -47931,9 +47933,9 @@ fi
if test "x$SUNCXX" = "xyes"; then if test "x$SUNCXX" = "xyes"; then
AR=$CXX AR=${AR:-"$CXX"}
AROPTIONS="-xar -o" AROPTIONS=${AROPTIONS:-"-xar -o"}
else else
if test -n "$ac_tool_prefix"; 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. # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.

10
configure.in
View File

@@ -1465,9 +1465,13 @@ AC_PROG_RANLIB
dnl ar command dnl ar command
dnl defines AR with the appropriate command dnl defines AR with the appropriate command
AC_CHECK_TOOL(AR, ar) dnl
if test "x$AR" = "x" ; then dnl For Sun CC AC_BAKEFILE below sets AR to the compiler itself.
AC_MSG_ERROR([ar is needed to build wxWidgets]) 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 fi
dnl install checks dnl install checks