зеркало из https://github.com/mozilla/pjs.git
Linux shouldn't need the mkdetect scripts any longer. Get rid of bogus motif dependency as well.
This commit is contained in:
Родитель
e09fcfcbab
Коммит
63d5da4bf2
|
@ -357,6 +357,7 @@ endif
|
|||
#
|
||||
# Need to define these before include the $ARCH.mk makefile
|
||||
#
|
||||
ifndef USE_AUTOCONF
|
||||
ifneq (,$(filter Linux,$(OS_ARCH)))
|
||||
MOZILLA_DETECT = 1
|
||||
MOZILLA_DETECT_DIR = $(DEPTH)/config/mkdetect
|
||||
|
@ -373,7 +374,6 @@ MOZILLA_DETECT_NAME = detect_$(MOZILLA_DETECT_UNIQ_IDENT)_gen.mk
|
|||
MOZILLA_DETECT_GEN = $(MOZILLA_DETECT_DIR)/$(MOZILLA_DETECT_NAME)
|
||||
endif
|
||||
|
||||
ifndef USE_AUTOCONF
|
||||
#
|
||||
# Now include the platform-specific stuff.
|
||||
#
|
||||
|
|
|
@ -40,11 +40,13 @@ DETECT_NAME = detect_$(DETECT_UNIQ_IDENT)_gen.mk
|
|||
DETECT_GLIBC = $(DETECT_DIR)/detect_glibc.sh -o $(DETECT_UNIQ_IDENT) \
|
||||
-cc $(CC)
|
||||
|
||||
ifeq (motif, $(MOZ_TOOLKIT))
|
||||
# The motif detection script
|
||||
DETECT_MOTIF =\
|
||||
$(DETECT_DIR)/detect_motif.sh -o $(DETECT_UNIQ_IDENT) \
|
||||
-xif $(X11_INCLUDE_FLAGS) \
|
||||
-cc $(CC)
|
||||
endif
|
||||
|
||||
# The X11 detection script
|
||||
DETECT_X11 = $(DETECT_DIR)/detect_x11.sh -o $(DETECT_UNIQ_IDENT) \
|
||||
|
|
Загрузка…
Ссылка в новой задаче