diff options
Diffstat (limited to 'config/Makefile.in')
-rw-r--r-- | config/Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/config/Makefile.in b/config/Makefile.in index 0360255b..b509ae9a 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -59,7 +59,7 @@ CSRCS += nsinstall.c PLSRCS = nfspwd.pl endif -ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) +ifeq (,$(CROSS_COMPILE)$(filter-out WINNT OS2,$(OS_ARCH))) PROG_SUFFIX = .exe else PROG_SUFFIX = @@ -90,7 +90,7 @@ endif ifeq ($(OS_ARCH), HP-UX) ifeq ($(USE_64),1) - XLDOPTS += +DA2.0W + XLDOPTS += +DD64 endif endif @@ -110,7 +110,7 @@ include $(topsrcdir)/config/rules.mk PROGS = $(OBJDIR)/now$(PROG_SUFFIX) -ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH))) +ifeq (,$(CROSS_COMPILE)$(filter-out OS2 WINNT,$(OS_ARCH))) TARGETS = $(PROGS) else PROGS += $(OBJDIR)/nsinstall$(PROG_SUFFIX) @@ -119,8 +119,10 @@ endif OUTOPTION = -o # end of the line ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET))) +ifndef NS_USE_GCC OUTOPTION = /Fe endif +endif # Redefine MAKE_OBJDIR for just this directory define MAKE_OBJDIR @@ -135,7 +137,7 @@ $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) ifeq ($(MOZ_OS2_TOOLS),VACPP) $(LD) $(EXEFLAGS) $< else - $(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@ + $(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ endif real_install:: nspr.m4 |