FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

configure.ac (--with-host-libstdcxx): New option.

Browse source 
* configure.ac (--with-host-libstdcxx): New option.
	* configure: Regenerate.

gcc/doc:
	* doc/install.texi (--with-host-libstdcxx): Document.

From-SVN: r144881
This commit is contained in:
Joseph Myers 2009-03-16 13:23:13 +00:00 • committed by Joseph Myers
parent d495ef5a6c
commit f38095f3ee
5 changed files with 52 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-03-16 Joseph Myers <joseph@codesourcery.com>
* configure.ac (--with-host-libstdcxx): New option.
* configure: Regenerate.
2009-03-12 Joern Rennecke <joern.rennecke@arc.com>
* MAINTAINERS: Move myself into the write after approval list.

25
configure vendored
View file

@ -969,6 +969,8 @@ Optional Packages:
plus --with-gmp-lib=PATH/lib
--with-gmp-include=PATH specify directory for installed GMP include files
--with-gmp-lib=PATH specify directory for the installed GMP library
--with-host-libstdcxx=L Use linker arguments L to link with libstdc++
when linking with PPL
--with-ppl=PATH Specify prefix directory for the installed PPL package
Equivalent to --with-ppl-include=PATH/include
plus --with-ppl-lib=PATH/lib
@ -4808,11 +4810,26 @@ fi
# Allow host libstdc++ to be specified for static linking with PPL.
# Check whether --with-host-libstdcxx or --without-host-libstdcxx was given.
if test "${with_host_libstdcxx+set}" = set; then
withval="$with_host_libstdcxx"
fi;
case $with_host_libstdcxx in
no|yes)
{ { echo "$as_me:$LINENO: error: -with-host-libstdcxx needs an argument" >&5
echo "$as_me: error: -with-host-libstdcxx needs an argument" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
# Check for PPL
ppl_major_version=0
ppl_minor_version=10
ppllibs=" -lppl_c -lppl -lgmpxx "
ppllibs=" -lppl_c -lppl -lgmpxx $with_host_libstdcxx "
pplinc=
@ -4839,7 +4856,7 @@ case $with_ppl in
ppllibs=
;;
*)
ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx"
ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx"
pplinc="-I$with_ppl/include $pplinc"
LIBS="$ppllibs $LIBS"
;;
@ -4848,11 +4865,11 @@ if test "x$with_ppl_include" != x; then
pplinc="-I$with_ppl_include $pplinc"
fi
if test "x$with_ppl_lib" != x; then
ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx"
ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx"
LIBS="$ppllibs $LIBS"
fi
if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '
ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '"$with_host_libstdcxx "
pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include '
LIBS="$ppllibs $LIBS"
fi

17
configure.ac
View file

@ -1315,11 +1315,20 @@ fi
AC_SUBST(gmplibs)
AC_SUBST(gmpinc)
# Allow host libstdc++ to be specified for static linking with PPL.
AC_ARG_WITH(host-libstdcxx, [ --with-host-libstdcxx=L Use linker arguments L to link with libstdc++
when linking with PPL])
case $with_host_libstdcxx in
no|yes)
AC_MSG_ERROR([-with-host-libstdcxx needs an argument])
;;
esac
# Check for PPL
ppl_major_version=0
ppl_minor_version=10
ppllibs=" -lppl_c -lppl -lgmpxx "
ppllibs=" -lppl_c -lppl -lgmpxx $with_host_libstdcxx "
pplinc=
AC_ARG_WITH(ppl, [ --with-ppl=PATH Specify prefix directory for the installed PPL package
@ -1333,7 +1342,7 @@ case $with_ppl in
ppllibs=
;;
*)
ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx"
ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx"
pplinc="-I$with_ppl/include $pplinc"
LIBS="$ppllibs $LIBS"
;;
@ -1342,11 +1351,11 @@ if test "x$with_ppl_include" != x; then
pplinc="-I$with_ppl_include $pplinc"
fi
if test "x$with_ppl_lib" != x; then
ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx"
ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx"
LIBS="$ppllibs $LIBS"
fi
if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '
ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '"$with_host_libstdcxx "
pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include '
LIBS="$ppllibs $LIBS"
fi

4
gcc/ChangeLog
View file

@ -1,3 +1,7 @@
2009-03-16 Joseph Myers <joseph@codesourcery.com>
* doc/install.texi (--with-host-libstdcxx): Document.
2009-03-14 Anatoly Sokolov <aesok@post.ru>
PR target/34299

9
gcc/doc/install.texi
View file

@ -1476,6 +1476,15 @@ you can explicitly specify the directory where they are installed
shorthand assumptions are not correct, you can use the explicit
include and lib options directly.
@item --with-host-libstdcxx=@var{linker-args}
If you are linking with a static copy of PPL, you can use this option
to specify how the linker should find the standard C++ library used
internally by PPL. Typical values of @var{linker-args} might be
@samp{-lstdc++} or @samp{-Wl,-Bstatic,-lstdc++,-Bdynamic -lm}. If you are
linking with a shared copy of PPL, you probably do not need this
option; shared library dependencies will cause the linker to search
for the standard C++ library automatically.
@item --with-debug-prefix-map=@var{map}
Convert source directory names using @option{-fdebug-prefix-map} when
building runtime libraries. @samp{@var{map}} is a space-separated