diff options
-rw-r--r-- | ld/ChangeLog | 4 | ||||
-rw-r--r-- | ld/scripttempl/mcorepe.sc | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 3f3d8d6..42f040d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +1999-07-08 Felix Lee <flee@cygnus.com> + + * scripttempl/mcorepe.sc: fix quoting problem, for bash 2.x + 1999-07-08 Jakub Jelinek <jj@ultra.linux.cz> * ldfile.c (ldfile_open_file_search): Skip libraries made for diff --git a/ld/scripttempl/mcorepe.sc b/ld/scripttempl/mcorepe.sc index b971338..65f770c 100644 --- a/ld/scripttempl/mcorepe.sc +++ b/ld/scripttempl/mcorepe.sc @@ -35,9 +35,16 @@ else R_RSRC= fi -cat <<EOF -${RELOCATING+OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}", +if test "$RELOCATING"; then + # Can't use ${RELOCATING+blah "blah" blah} for this, + # because bash 2.x will lose the doublequotes. + cat <<EOF +OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}", "${LITTLE_OUTPUT_FORMAT}")} +EOF +fi + +cat <<EOF ${LIB_SEARCH_DIRS} ENTRY(_mainCRTStartup) |