summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-18 20:52:51 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-18 20:52:51 +0000
commit6b6b071bcf8e61ae6f946dfac2e5f57d7c363cfe (patch)
treed75b464e3d47b64b11a6dd7c82644aa9823717d9
parent53962bfbab25dcc1d63b30712a558e277b0a77fb (diff)
2003-09-18 Jay Monkman <jtm@smoothsmoothie.com>
PR 494/networking * Changed Makefile to not use objcopy to create a linkable object file from the tar file. Instead, ld links it in directly.
-rw-r--r--ChangeLog7
-rw-r--r--http/Makefile4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9905f4e..d047b31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-18 Jay Monkman <jtm@smoothsmoothie.com>
+
+ PR 494/networking
+ * Changed Makefile to not use objcopy to create a linkable
+ object file from the tar file. Instead, ld links it in
+ directly.
+
2003-09-18 Joel Sherrill <joel@OARcorp.com>
PR 493/networking
diff --git a/http/Makefile b/http/Makefile
index c31caa3..85a416e 100644
--- a/http/Makefile
+++ b/http/Makefile
@@ -58,8 +58,8 @@ all: ${ARCH} $(SRCS) $(PGM)
${PGM}: $(OBJS) $(LINK_FILES)
cd rootfs ; tar cf ../$(ARCH)/tarfile web etc
cp $(ARCH)/tarfile .
- $(OBJCOPY) -I binary -O $(NATIVE_OBJ) tarfile $(ARCH)/tarfile.o
- $(LD) -r -o $(ARCH)/temp.o $(ARCH)/init.o $(ARCH)/tarfile.o
+ $(LD) -r -o $(ARCH)/temp.o $(ARCH)/init.o \
+ -b binary tarfile
$(MV) $(ARCH)/temp.o $(ARCH)/init.o
$(RM) $(ARCH)/temp.o
$(make-exe)