diff options
| author | aoliva <> | 2000-09-06 12:59:29 +0000 |
|---|---|---|
| committer | aoliva <> | 2000-09-06 12:59:29 +0000 |
| commit | 4265a4ef9520c4c9f59d6b2793cdd8f3f25d6452 (patch) | |
| tree | d2c11ae7c5b961d2ad3c22fa58daad1ae1236f8b /ltcf-gcj.sh | |
| parent | 6d5c713561c64c19f363fc34eb9fda249b1b5db6 (diff) | |
* ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh, ltcf-cxx.sh,
ltcf-gcj.sh: Updated from libtool multi-language branch.
Diffstat (limited to 'ltcf-gcj.sh')
| -rw-r--r-- | ltcf-gcj.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ltcf-gcj.sh b/ltcf-gcj.sh index 12e9171b78b..acb30c0ace1 100644 --- a/ltcf-gcj.sh +++ b/ltcf-gcj.sh @@ -1,7 +1,5 @@ #### This script is meant to be sourced by ltconfig. -# $Id: ltcf-gcj.sh,v 1.1.2.5 2000/07/20 02:29:15 oliva Exp $ - # ltcf-gcj.sh - Create a GCJ compiler specific configuration # # Copyright (C) 1996-1999,2000 Free Software Foundation, Inc. @@ -95,7 +93,7 @@ EOF allow_undefined_flag=unsupported # Joseph Beckenbach <jrb3@best.com> says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $linker_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -196,8 +194,8 @@ EOF EOF elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $linker_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linker_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -222,8 +220,8 @@ EOF if test "$ld_shlibs" = yes; then runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec="$wlarc"'--rpath '"$wlarc"'$libdir' - export_dynamic_flag_spec="$wlarc"'--export-dynamic' + hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' case $host_os in cygwin* | mingw*) # dlltool doesn't understand --whole-archive et. al. |