samsonium/libffi
1
0
Fork 0
mirror of https://github.com/partic2/libffi synced 2026-11-10 18:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #206 from edolnx/master

Browse Source 
Add configure flag to disable multi-os-directory support
This commit is contained in:
Anthony Green
2016-02-20 06:43:28 -05:00
parent 0bb71b52f5 877ea9bf9a
commit 183ee6a672
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+11 -5
View File
@@ -337,6 +337,10 @@ AC_ARG_ENABLE(purify-safety,
AC_DEFINE(USING_PURIFY, 1, [Define this if you are using Purify and want to suppress spurious messages.]) AC_DEFINE(USING_PURIFY, 1, [Define this if you are using Purify and want to suppress spurious messages.])
fi) fi)
AC_ARG_ENABLE(multi-os-directory,
[ --disable-multi-os-directory
disable use of gcc --print-multi-os-directory to change the library installation directory])
# These variables are only ever used when we cross-build to X86_WIN32. # These variables are only ever used when we cross-build to X86_WIN32.
# And we only support this with GCC, so... # And we only support this with GCC, so...
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
@@ -348,11 +352,13 @@ if test "x$GCC" = "xyes"; then
toolexecdir="${libdir}"/gcc-lib/'$(target_alias)' toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
toolexeclibdir="${libdir}" toolexeclibdir="${libdir}"
fi fi
multi_os_directory=`$CC $CFLAGS -print-multi-os-directory` if test x"$enable_multi_os_directory" != x"no"; then
case $multi_os_directory in multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
.) ;; # Avoid trailing /. case $multi_os_directory in
../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; .) ;; # Avoid trailing /.
esac ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
esac
fi
AC_SUBST(toolexecdir) AC_SUBST(toolexecdir)
else else
toolexeclibdir="${libdir}" toolexeclibdir="${libdir}"