diff options
author | Ian Lance Taylor <iant@golang.org> | 2020-01-24 06:31:04 -0800 |
---|---|---|
committer | Ian Lance Taylor <iant@golang.org> | 2020-01-24 06:33:46 -0800 |
commit | ba386bea11173bfa2f7c76b6368a49a43f366eea (patch) | |
tree | 524535136bfac2d362859069283279975c999139 /libgo/configure | |
parent | a1f6eff20e3bb32c5051e77093ee28faec2abca0 (diff) |
libgo: handle --with-toolexeclibdir=.
Patch by Maciej W. Rozycki.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/216239
Diffstat (limited to 'libgo/configure')
-rwxr-xr-x | libgo/configure | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/libgo/configure b/libgo/configure index 385ca9a65cd..2f787392abd 100755 --- a/libgo/configure +++ b/libgo/configure @@ -849,6 +849,7 @@ enable_fast_install enable_libtool_lock enable_werror enable_version_specific_runtime_libs +with_toolexeclibdir with_libffi with_libatomic with_system_libunwind @@ -1503,6 +1504,9 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] + --with-toolexeclibdir=DIR + install libraries built with a cross compiler within + DIR --without-libffi don't use libffi --without-libatomic don't use libatomic --with-system-libunwind use installed libunwind @@ -11486,7 +11490,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11489 "configure" +#line 11493 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11592,7 +11596,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11595 "configure" +#line 11599 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13800,6 +13804,22 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version_specific_libs" >&5 $as_echo "$version_specific_libs" >&6; } + +# Check whether --with-toolexeclibdir was given. +if test "${with_toolexeclibdir+set}" = set; then : + withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in + /) + ;; + */) + with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'` + ;; +esac +else + with_toolexeclibdir=no +fi + + + # Version-specific runtime libs processing. if test $version_specific_libs = yes; then glibgo_toolexecdir='${libdir}/gcc/${host_alias}' @@ -13811,7 +13831,14 @@ fi if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then nover_glibgo_toolexecdir='${exec_prefix}/${host_alias}' - nover_glibgo_toolexeclibdir='${toolexecdir}/lib' + case ${with_toolexeclibdir} in + no) + nover_glibgo_toolexeclibdir='${toolexecdir}/lib' + ;; + *) + nover_glibgo_toolexeclibdir=${with_toolexeclibdir} + ;; + esac else nover_glibgo_toolexecdir='${libdir}/gcc/${host_alias}' nover_glibgo_toolexeclibdir='${libdir}' |