diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-07-07 05:30:33 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-07-07 05:30:33 +0000 |
| commit | c0a6fcd75b58fd2fa7923e4a3cc59a1afaacc76d (patch) | |
| tree | 810e1b06cccc18c8fac1e71589ac075f5e2658b9 | |
| parent | 0e5db0bfe8f7c4260dbdf651b169c6d3a0f8773c (diff) | |
| download | cygnal-c0a6fcd75b58fd2fa7923e4a3cc59a1afaacc76d.tar.gz cygnal-c0a6fcd75b58fd2fa7923e4a3cc59a1afaacc76d.tar.bz2 cygnal-c0a6fcd75b58fd2fa7923e4a3cc59a1afaacc76d.zip | |
* newsym: Reenable removal of tmp directory. Just use ar to generate archive
index.
* Makefile.in: Don't send ranlib to newsym.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/Makefile.in | 4 | ||||
| -rwxr-xr-x | winsup/cygwin/newsym | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 16032cea3..e11085fbf 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 2003-07-07 Christopher Faylor <cgf@redhat.com> + * newsym: Reenable removal of tmp directory. Just use ar to generate + archive index. + * Makefile.in: Don't send ranlib to newsym. + +2003-07-07 Christopher Faylor <cgf@redhat.com> + * newsym: Create objects that are closer to those created by dlltool so as not to confuse --export-all-symbols. * rmsym: Be a little more accepting of object filenames now that diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 156188fed..1de12bd4a 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -343,8 +343,8 @@ $(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $ # Rule to build libcygwin.a $(LIB_NAME): rmsym newsym $(TEST_DLL_NAME) $(LIBCOS) - /bin/sh ${word 1,$^} ./cygdll.a "$(NM)" "$(AR)" "$(RANLIB)" $(OBSOLETE_FUNCTIONS) || exit 0 - /bin/sh ${word 2,$^} ./cygdll.a "$(AS)" "$(AR)" "$(RANLIB)" $(NEW_FUNCTIONS) || exit 0 + /bin/sh ${word 1,$^} ./cygdll.a "$(NM)" "$(AR)" $(OBSOLETE_FUNCTIONS) || exit 0 + /bin/sh ${word 2,$^} ./cygdll.a "$(AS)" "$(AR)" $(NEW_FUNCTIONS) || exit 0 (echo create $(LIB_NAME); echo addmod $(LIBCOS); echo addlib cygdll.a; echo save) | $(AR) -M $(RANLIB) $@ diff --git a/winsup/cygwin/newsym b/winsup/cygwin/newsym index b0f68fec2..301958ee5 100755 --- a/winsup/cygwin/newsym +++ b/winsup/cygwin/newsym @@ -2,9 +2,8 @@ lib=$1; shift as=$1; shift ar=$1; shift -ranlib=$1; shift rm -rf newsym.dir -# trap "rm -rf newsym.dir" 0 1 2 15 +trap "rm -rf newsym.dir" 0 1 2 15 mkdir newsym.dir while [ -n "$1" ]; do newsym=$1; shift @@ -31,5 +30,4 @@ __imp__$newsym: .rva 1f EOF $as -o newsym.dir/$newsym.o newsym.dir/$newsym.s done -$ar cru $lib newsym.dir/*.o -$ranlib $lib +$ar crus $lib newsym.dir/*.o |