Branch: Tag:

2016-03-30

2016-03-30 14:47:52 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Build [Configure]: Second attempt at fixing --with-abi.

The previous patch broke the AC_CHECK_SIZEOF-tests when using
a non-default ABI.

640:   # Skip if user does not wish to use smartlink binary.   if test "x$force_smartlink_script_only" = "x"; then   # Strip smartlink and arguments from $CC - REALCC="`echo $CC|sed -e 's/.*smartlink *//' -e 's/ .*//g'`" + REALCC="`echo $CC|sed -e 's/.*smartlink *//'`"; + RAWCC="`echo $REALCC|sed -e 's/ .*//g'`"         # FIXME: Add proper tests
786:   pike_cv_prog_CC="$CC"      # Strip smartlink and arguments from $CXX - REALCXX="`echo $CXX|sed -e 's/.*smartlink *//' -e 's/ .*//g'`" + REALCXX="`echo $CXX|sed -e 's/.*smartlink *//'`" + RAWCXX="`echo $REALCXX|sed -e 's/ .*//g'`"   CXX="$SMARTLINK $REALCXX"   pike_cv_prog_CXX="$CXX"   
797:      AC_MSG_CHECKING([for a fallback compiler])   # Strip smartlink and arguments from $FALLBACK_CC - FALLBACK_CC="`echo $FALLBACK_CC|sed -e 's/.*smartlink *//' -e 's/ .*//g'`" + FALLBACK_CC="`echo $FALLBACK_CC|sed -e 's/.*smartlink *//'`"   if test "x$FALLBACK_CC" = "x"; then    AC_MSG_RESULT(no)   else
8035:    # Ensure that the propagated CC (if any) is up to date.    # Otherwise the sub-configures will attempt to use eg    # -R with the raw compiler, which only works on Solaris. -  ac_configure_args=`echo " $ac_configure_args " | sed -e "s% 'CC=$REALCC' % 'CC=$CC' %g"` +  ac_configure_args=`echo " $ac_configure_args " | sed -e "s% 'CC=$REALCC' % 'CC=$CC' %g" -e "s% 'CC=$RAWCC' % 'CC=$CC' %g"`   ])      AC_CONFIG_SUBDIRS(modules post_modules)