зеркало из https://github.com/mozilla/gecko-dev.git
There's no need to create a target version of nsinstall so always compile it for the host platform.
This commit is contained in:
Родитель
bd00354a35
Коммит
60781554cb
|
@ -26,15 +26,17 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = nsinstall$(BIN_SUFFIX)
|
||||
ifdef CROSS_COMPILE
|
||||
HOST_PROGRAM = host_nsinstall
|
||||
HOST_PROGRAM = nsinstall$(BIN_SUFFIX)
|
||||
else
|
||||
PROGRAM = nsinstall$(BIN_SUFFIX)
|
||||
endif
|
||||
|
||||
CSRCS = nsinstall.c pathsub.c
|
||||
PLSRCS = nfspwd.pl revdepth.pl
|
||||
ifdef CROSS_COMPILE
|
||||
HOST_CSRCS = $(CSRCS)
|
||||
HOST_CSRCS = nsinstall.c pathsub.c
|
||||
else
|
||||
CSRCS = nsinstall.c pathsub.c
|
||||
endif
|
||||
|
||||
TARGETS = $(HOST_PROGRAM) $(PROGRAM) $(PLSRCS:.pl=)
|
||||
|
|
|
@ -579,11 +579,7 @@ endif
|
|||
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)))
|
||||
ifdef CROSS_COMPILE
|
||||
NSINSTALL = $(CONFIG_TOOLS)/host_nsinstall
|
||||
else
|
||||
NSINSTALL = $(CONFIG_TOOLS)/nsinstall
|
||||
endif
|
||||
|
||||
ifeq ($(NSDISTMODE),copy)
|
||||
# copy files, but preserve source mtime
|
||||
|
|
Загрузка…
Ссылка в новой задаче