diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-08-16 17:39:46 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-08-16 17:39:46 +0000 |
| commit | 0cbc6dbe83de51fca6b35137707c1925b67f9aaa (patch) | |
| tree | e04602b6a77f46a0c655dc85228b0772b6ab279f | |
| parent | 2007-08-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | network-demos-0cbc6dbe83de51fca6b35137707c1925b67f9aaa.tar.bz2 | |
2007-08-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile: Account for -B architecture option.
| -rw-r--r-- | http/ChangeLog | 4 | ||||
| -rw-r--r-- | http/Makefile | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/http/ChangeLog b/http/ChangeLog index c22162f..3095354 100644 --- a/http/ChangeLog +++ b/http/ChangeLog @@ -1,3 +1,7 @@ +2007-08-16 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile: Account for -B architecture option. + 2007-07-18 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile: Eliminate unneeded temp.o diff --git a/http/Makefile b/http/Makefile index 0692369..65b3003 100644 --- a/http/Makefile +++ b/http/Makefile @@ -76,6 +76,8 @@ CLOBBER_ADDITIONS += # strip out flags gcc knows but LD doesn't like -- add as needed LD_CPU_CFLAGS=$(CPU_CFLAGS:-mstrict-align:) +COPY_ARCH=$(shell echo $(OBJCOPY) | cut -d'-' -f1) + all: ${ARCH} $(SRCS) $(PGM) obj_format: @@ -88,7 +90,8 @@ ${PGM}: $(OBJS) $(LINK_FILES) $(ARCH)/tarfile.o: $(ARCH) stamp-index-html obj_format cd rootfs ; tar cf ../$(ARCH)/tarfile --exclude CVS . cp $(ARCH)/tarfile . - $(OBJCOPY) -I binary -O `cat obj_format` tarfile $(ARCH)/tarfile.o + $(OBJCOPY) -I binary -O `cat obj_format` \ + -B $(COPY_ARCH) tarfile $(ARCH)/tarfile.o stamp-index-html: index.html.in ifneq ($(HTTPD),) @@ -100,3 +103,4 @@ endif # for include files, just use $(INSTALL) install: all $(INSTALL_VARIANT) -m 555 ${PGM} ${PROJECT_RELEASE}/tests + |