From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- make/custom/pc386.cfg | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'make/custom/pc386.cfg') diff --git a/make/custom/pc386.cfg b/make/custom/pc386.cfg index fcc7697fbe..a9b23ad1ab 100644 --- a/make/custom/pc386.cfg +++ b/make/custom/pc386.cfg @@ -81,13 +81,16 @@ define make-exe $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0 $(NM) -g -n $(basename $@).obj > $(basename $@).num $(SIZE) $(basename $@).obj - $(INSTALL_PROGRAM) -D -m 555 $(basename $@).bt \ + test -d ${PROJECT_RELEASE}/BootImgs \ + || mkdir ${PROJECT_RELEASE}/BootImgs + cp $(basename $@).bt \ ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt + chmod 755 \ + ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt endef else define make-exe - $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \ - -Wl,--oformat,elf32-i386 -o $(basename $@).obj \ + $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -Wl,-Ttext,$(RELOCADDR) \ -o $(basename $@).obj \ $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O elf32-i386 \ @@ -100,16 +103,19 @@ define make-exe $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0 $(NM) -g -n $(basename $@).obj > $(basename $@).num $(SIZE) $(basename $@).obj - @$(mkinstalldirs) ${PROJECT_RELEASE}/BootImgs - $(INSTALL_PROGRAM) -D -m 555 $(basename $@).bt \ - ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt - $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \ + test -d ${PROJECT_RELEASE}/BootImgs \ + || mkdir ${PROJECT_RELEASE}/BootImgs + f=`basename $@ .exe`; \ + cp $(basename $@).bt \ + ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt \ + && chmod 755 \ + ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt + $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -Wl,-Ttext,$(RELOCADDR) \ -o $@ $(LINK_OBJS) $(LINK_LIBS) endef define make-cxx-exe - $(CXX) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \ - -Wl,--oformat,elf32-i386 -o $(basename $@).obj \ - -o $(basename $@).obj \ + $(LINK.cc) $(AM_CFLAGS) $(AM_CXXFLAGS) $(AM_LDFLAGS) \ + -Wl,-Ttext,$(RELOCADDR) -o $(basename $@).obj \ $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O elf32-i386 \ --remove-section=.rodata \ @@ -121,9 +127,15 @@ define make-cxx-exe $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0 $(NM) -g -n $(basename $@).obj > $(basename $@).num $(SIZE) $(basename $@).obj - $(INSTALL_PROGRAM) -D -m 555 $(basename $@).bt \ - ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt - $(CXX) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \ + test -d ${PROJECT_RELEASE}/BootImgs \ + || mkdir ${PROJECT_RELEASE}/BootImgs + f=`basename $@ .exe`; \ + cp $(basename $@).bt \ + ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt \ + && chmod 755 \ + ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt + $(LINK.cc) $(AM_CFLAGS) $(AM_CXXFLAGS) $(AM_LDFLAGS) \ + -Wl,-Ttext,$(RELOCADDR) \ -o $(basename $@).coff $(LINK_OBJS) $(LINK_LIBS) endef endif -- cgit v1.2.3