* newsym: Reenable removal of tmp directory. Just use ar to generate archive

index.
* Makefile.in: Don't send ranlib to newsym.
This commit is contained in:
Christopher Faylor 2003-07-07 05:30:33 +00:00
parent 0e5db0bfe8
commit c0a6fcd75b
3 changed files with 10 additions and 6 deletions

@ -1,3 +1,9 @@
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> 2003-07-07 Christopher Faylor <cgf@redhat.com>
* newsym: Create objects that are closer to those created by dlltool so * newsym: Create objects that are closer to those created by dlltool so

@ -343,8 +343,8 @@ $(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $
# Rule to build libcygwin.a # Rule to build libcygwin.a
$(LIB_NAME): rmsym newsym $(TEST_DLL_NAME) $(LIBCOS) $(LIB_NAME): rmsym newsym $(TEST_DLL_NAME) $(LIBCOS)
/bin/sh ${word 1,$^} ./cygdll.a "$(NM)" "$(AR)" "$(RANLIB)" $(OBSOLETE_FUNCTIONS) || exit 0 /bin/sh ${word 1,$^} ./cygdll.a "$(NM)" "$(AR)" $(OBSOLETE_FUNCTIONS) || exit 0
/bin/sh ${word 2,$^} ./cygdll.a "$(AS)" "$(AR)" "$(RANLIB)" $(NEW_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 (echo create $(LIB_NAME); echo addmod $(LIBCOS); echo addlib cygdll.a; echo save) | $(AR) -M
$(RANLIB) $@ $(RANLIB) $@

@ -2,9 +2,8 @@
lib=$1; shift lib=$1; shift
as=$1; shift as=$1; shift
ar=$1; shift ar=$1; shift
ranlib=$1; shift
rm -rf newsym.dir 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 mkdir newsym.dir
while [ -n "$1" ]; do while [ -n "$1" ]; do
newsym=$1; shift newsym=$1; shift
@ -31,5 +30,4 @@ __imp__$newsym: .rva 1f
EOF EOF
$as -o newsym.dir/$newsym.o newsym.dir/$newsym.s $as -o newsym.dir/$newsym.o newsym.dir/$newsym.s
done done
$ar cru $lib newsym.dir/*.o $ar crus $lib newsym.dir/*.o
$ranlib $lib