зеркало из https://github.com/mozilla/pjs.git
Bug 536453 - Don't build NSS's nsinstall, r=ted
--HG-- extra : rebase_source : 19c03fcdb4d4498171c572d87f7611a8fb878f12
This commit is contained in:
Родитель
b0a38ec573
Коммит
7c1840188c
|
@ -183,6 +183,7 @@ DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
|
|||
DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
|
||||
DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
|
||||
DEFAULT_GMAKE_FLAGS += IMPORT_LIB_SUFFIX=".$(IMPORT_LIB_SUFFIX)"
|
||||
DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)"
|
||||
ifndef MOZ_NATIVE_SQLITE
|
||||
DEFAULT_GMAKE_FLAGS += SQLITE=$(call EXPAND_LIBNAME,mozsqlite3)
|
||||
endif
|
||||
|
@ -247,7 +248,6 @@ ifdef CROSS_COMPILE
|
|||
|
||||
ifdef WINCE
|
||||
DEFAULT_GMAKE_FLAGS += \
|
||||
NSINSTALL="$(NSINSTALL)" \
|
||||
NATIVE_CC="$(HOST_CC)" \
|
||||
CC="$(CC)" \
|
||||
CCC="$(CC)" \
|
||||
|
@ -265,7 +265,6 @@ DEFAULT_GMAKE_FLAGS += \
|
|||
$(NULL)
|
||||
else
|
||||
DEFAULT_GMAKE_FLAGS += \
|
||||
NSINSTALL="$(NSINSTALL)" \
|
||||
NATIVE_CC="$(HOST_CC)" \
|
||||
CC="$(CC)" \
|
||||
CCC="$(CXX)" \
|
||||
|
@ -317,7 +316,6 @@ endif
|
|||
|
||||
libs::
|
||||
ifndef MOZ_NATIVE_NSS
|
||||
$(NSSMAKE) -C $(NSS_SRCDIR)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
|
||||
ifndef NSS_DISABLE_DBM
|
||||
$(NSSMAKE) -C $(NSS_SRCDIR)/security/dbm $(DEFAULT_GMAKE_FLAGS)
|
||||
endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче