Mercurial > octave

comparison configure.ac @ 21925:a53f46577e39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix variable expansion in dynamic linking flags for macOS (bug #48215) * configure.ac (DL_LDFLAGS): Use ${ac_top_build_prefix} for correct value. (MKOCTFILE_DL_LDFLAGS): Defer expansion of ${bindir} and ${version} until they are fully defined.
author Mike Miller <mtmiller@octave.org>
date Thu, 16 Jun 2016 08:42:29 -0700
parents 74d60f5e37be
children e9765b62d4e8
comparison
equal deleted inserted replaced
21924:43a5d019e6cc 21925:a53f46577e39
2036 CXXPICFLAG= 2036 CXXPICFLAG=
2037 FPICFLAG= 2037 FPICFLAG=
2038 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'" 2038 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'"
2039 ;; 2039 ;;
2040 *-*-darwin*) 2040 *-*-darwin*)
2041 DL_LDFLAGS="-bundle -bundle_loader ${top_builddir}/libinterp/octave ${LDFLAGS}" 2041 DL_LDFLAGS="-bundle -bundle_loader ${ac_top_build_prefix}libinterp/octave ${LDFLAGS}"
2042 MKOCTFILE_DL_LDFLAGS="-bundle -bundle_loader ${bindir}/octave-${version}${EXEEXT}" 2042 ## Contains variables that are defined and undefined at this point, so use
2043 ## appropriate quoting to defer expansion of ${bindir} and ${version}.
2044 MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}"
2043 SH_LDFLAGS="-dynamiclib -single_module ${LDFLAGS}" 2045 SH_LDFLAGS="-dynamiclib -single_module ${LDFLAGS}"
2044 case $canonical_host_type in 2046 case $canonical_host_type in
2045 powerpc-*) 2047 powerpc-*)
2046 CXXPICFLAG= 2048 CXXPICFLAG=
2047 CPICFLAG= 2049 CPICFLAG=
3306 eval startupfiledir="\"$startupfiledir\"" 3308 eval startupfiledir="\"$startupfiledir\""
3307 eval localstartupfiledir="\"$localstartupfiledir\"" 3309 eval localstartupfiledir="\"$localstartupfiledir\""
3308 eval man1dir="\"$man1dir\"" 3310 eval man1dir="\"$man1dir\""
3309 eval man1ext="\"$man1ext\"" 3311 eval man1ext="\"$man1ext\""
3310 eval infofile="\"$infofile\"" 3312 eval infofile="\"$infofile\""
3313
3314 ## Also expand MKOCTFILE_DL_LDFLAGS, because it may depend on the values
3315 ## of variables expanded above.
3316
3317 eval MKOCTFILE_DL_LDFLAGS="\"$MKOCTFILE_DL_LDFLAGS\""
3311 ]) 3318 ])
3312 3319
3313 ### Do the substitutions in Makefiles and other scripts that 3320 ### Do the substitutions in Makefiles and other scripts that
3314 ### hold configuration info. 3321 ### hold configuration info.
3315 3322