Mercurial > octave

changeset 21420:29e8d4a922b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
expand MKOCTFILE variables in configure script * configure.ac: Unless ' is necessary, use " to quote shell variables. (MKOCTFILE_AR, MKOCTFILE_CC, MKOCTFILE_CXX, MKOCTFILE_DL_LD, MKOCTFILE_F77, MKOCTFILE_LD_CXX, MKOCTFILE_RANLIB): If cross compiling, expand at point of definition.
author John W. Eaton <jwe@octave.org>
date Wed, 09 Mar 2016 13:14:35 -0500
parents 13415264b9f8
children fdb9adcc02f9
files configure.ac
diffstat 1 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed Mar 09 09:55:32 2016 -0800
+++ b/configure.ac	Wed Mar 09 13:14:35 2016 -0500
@@ -2031,7 +2031,7 @@
     SH_LDFLAGS=-Bshareable
   ;;
   *-*-openbsd*)
-    SH_LDFLAGS='-shared -fPIC'
+    SH_LDFLAGS="-shared -fPIC"
   ;;
   *-*-freebsd*)
     SH_LDFLAGS="-shared -Wl,-x"
@@ -2043,9 +2043,9 @@
     SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'"
   ;;
   *-*-darwin*)
-    DL_LDFLAGS='-bundle -bundle_loader ${top_builddir}/libinterp/octave ${LDFLAGS}'
-    MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader ${bindir}/octave-${version}${EXEEXT}'
-    SH_LDFLAGS='-dynamiclib -single_module ${LDFLAGS}'
+    DL_LDFLAGS="-bundle -bundle_loader ${top_builddir}/libinterp/octave ${LDFLAGS}"
+    MKOCTFILE_DL_LDFLAGS="-bundle -bundle_loader ${bindir}/octave-${version}${EXEEXT}"
+    SH_LDFLAGS="-dynamiclib -single_module ${LDFLAGS}"
     case $canonical_host_type in
       powerpc-*)
         CXXPICFLAG=
@@ -2385,13 +2385,13 @@
 
 if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then
   CROSS_TOOL_PREFIX="$ac_tool_prefix"
-  MKOCTFILE_AR='$(shell echo ${AR} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
-  MKOCTFILE_CC='$(shell echo ${CC} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
-  MKOCTFILE_CXX='$(shell echo ${CXX} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
-  MKOCTFILE_DL_LD='$(shell echo ${DL_LD} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
-  MKOCTFILE_F77='$(shell echo ${F77} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
-  MKOCTFILE_LD_CXX='$(shell echo ${LD_CXX} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
-  MKOCTFILE_RANLIB='$(shell echo ${RANLIB} | ${SED} "s,${CROSS_TOOL_PREFIX},,")'
+  MKOCTFILE_AR=`echo "$AR" | $SED "s,$CROSS_TOOL_PREFIX,,"`
+  MKOCTFILE_CC=`echo "$CC" | $SED "s,$CROSS_TOOL_PREFIX,,"`
+  MKOCTFILE_CXX=`echo "$CXX" | $SED "s,$CROSS_TOOL_PREFIX,,"`
+  MKOCTFILE_DL_LD=`echo "$DL_LD" | $SED "s,$CROSS_TOOL_PREFIX,,"`
+  MKOCTFILE_F77=`echo "$F77" | $SED "s,$CROSS_TOOL_PREFIX,,"`
+  MKOCTFILE_LD_CXX=`echo "$LD_CXX" | $SED "s,$CROSS_TOOL_PREFIX,,"`
+  MKOCTFILE_RANLIB=`echo "$RANLIB" | $SED "s,$CROSS_TOOL_PREFIX,,"`
 else
   MKOCTFILE_AR="$AR"
   MKOCTFILE_CC="$CC"