diff options
Diffstat (limited to 'make/custom/pc386.cfg')
| -rw-r--r-- | make/custom/pc386.cfg | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/make/custom/pc386.cfg b/make/custom/pc386.cfg index b6edacea8d..a9b23ad1ab 100644 --- a/make/custom/pc386.cfg +++ b/make/custom/pc386.cfg @@ -90,8 +90,7 @@ define make-exe 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 \ @@ -111,13 +110,12 @@ define make-exe ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt \ && chmod 755 \ ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt - $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \ + $(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 \ @@ -136,7 +134,8 @@ define make-cxx-exe ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt \ && chmod 755 \ ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt - $(CXX) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \ + $(LINK.cc) $(AM_CFLAGS) $(AM_CXXFLAGS) $(AM_LDFLAGS) \ + -Wl,-Ttext,$(RELOCADDR) \ -o $(basename $@).coff $(LINK_OBJS) $(LINK_LIBS) endef endif |