Merged with HEAD from 8/18 or so. unlabeled-3.8.14
authorcls%seawood.org
Fri, 20 Aug 1999 16:21:21 +0000
branchunlabeled-3.8.14
changeset 756 cfbb338a1a7a
parent 612 743983ea5182
push idunknown
push userunknown
push dateunknown
Merged with HEAD from 8/18 or so.
config/Makefile
--- a/config/Makefile
+++ b/config/Makefile
@@ -79,22 +79,30 @@ PROGS	= $(OBJDIR)/now$(PROG_SUFFIX)
 
 ifeq ($(OS_ARCH),WINNT)
 TARGETS = $(PROGS)
 else
 PROGS	+= $(OBJDIR)/nsinstall$(PROG_SUFFIX)
 TARGETS = $(PROGS) $(PLSRCS:.pl=)
 endif
 
+OUTOPTION = -o
+ifeq ($(OS_ARCH), WINNT)
+ifeq ($(CPU_ARCH),ALPHA)
+OUTOPTION = /link /out:
+endif
+endif
+
 # Redefine MAKE_OBJDIR for just this directory
 define MAKE_OBJDIR
 if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); else true; fi
 endef
 
 export:: $(TARGETS)
 
 $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
 	@$(MAKE_OBJDIR)
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 	$(LINK) $(EXEFLAGS) $<
 else
-	$(CC) $(XCFLAGS) $< $(XLDOPTS) -o $@
+	$(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@
 endif
+