Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

There's no need to create a target version of nsinstall so always compile it for the host platform.

Browse Source
This commit is contained in:
seawood%netscape.com 2001-10-14 21:38:01 +00:00
parent bd00354a35
commit 60781554cb
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/Makefile.in
View File

@ -26,15 +26,17 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
PROGRAM = nsinstall$(BIN_SUFFIX)
ifdef CROSS_COMPILE ifdef CROSS_COMPILE
HOST_PROGRAM = host_nsinstall HOST_PROGRAM = nsinstall$(BIN_SUFFIX)
else
PROGRAM = nsinstall$(BIN_SUFFIX)
endif endif
CSRCS = nsinstall.c pathsub.c
PLSRCS = nfspwd.pl revdepth.pl PLSRCS = nfspwd.pl revdepth.pl
ifdef CROSS_COMPILE ifdef CROSS_COMPILE
HOST_CSRCS = $(CSRCS) HOST_CSRCS = nsinstall.c pathsub.c
else
CSRCS = nsinstall.c pathsub.c
endif endif
TARGETS = $(HOST_PROGRAM) $(PROGRAM) $(PLSRCS:.pl=) TARGETS = $(HOST_PROGRAM) $(PROGRAM) $(PLSRCS:.pl=)

4
config/config.mk
View File

@ -579,11 +579,7 @@ endif
GARBAGE += $(DEPENDENCIES) $(MKDEPENDENCIES) $(MKDEPENDENCIES).bak core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o) Templates.DB GARBAGE += $(DEPENDENCIES) $(MKDEPENDENCIES) $(MKDEPENDENCIES).bak core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o) Templates.DB
ifneq (,$(filter-out WINNT, $(OS_ARCH))) ifneq (,$(filter-out WINNT, $(OS_ARCH)))
ifdef CROSS_COMPILE
NSINSTALL = $(CONFIG_TOOLS)/host_nsinstall
else
NSINSTALL = $(CONFIG_TOOLS)/nsinstall NSINSTALL = $(CONFIG_TOOLS)/nsinstall
endif
ifeq ($(NSDISTMODE),copy) ifeq ($(NSDISTMODE),copy)
# copy files, but preserve source mtime # copy files, but preserve source mtime