summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcls%seawood.org <devnull@localhost>1999-08-20 16:21:21 +0000
committercls%seawood.org <devnull@localhost>1999-08-20 16:21:21 +0000
commit0c70aea5dc26d5e13a8f0343911614d503588161 (patch)
tree149dfd9d7cbb77196f82ea0d571a4ff0c2260492
parentd15ab1a3e715ba460498a9d70c8d9cb825955802 (diff)
downloadnspr-hg-unlabeled-3.8.14.tar.gz
Merged with HEAD from 8/18 or so.unlabeled-3.8.14
-rw-r--r--config/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/config/Makefile b/config/Makefile
index 6a48ed63..e52ce589 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -84,6 +84,13 @@ 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
@@ -96,5 +103,6 @@ $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
$(LINK) $(EXEFLAGS) $<
else
- $(CC) $(XCFLAGS) $< $(XLDOPTS) -o $@
+ $(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@
endif
+