зеркало из https://github.com/mozilla/gecko-dev.git
Bug 947402 - Don't attempt to package shared ICU for --with-system-icu; r=glandium
This commit is contained in:
Родитель
a0201ff201
Коммит
d37c67b665
|
@ -112,6 +112,9 @@ endif
|
||||||
DEFINES += -DBINPATH=$(BINPATH)
|
DEFINES += -DBINPATH=$(BINPATH)
|
||||||
|
|
||||||
DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
|
DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
|
||||||
|
ifdef MOZ_NATIVE_ICU
|
||||||
|
DEFINES += -DMOZ_NATIVE_ICU
|
||||||
|
endif
|
||||||
ifdef MOZ_SHARED_ICU
|
ifdef MOZ_SHARED_ICU
|
||||||
DEFINES += -DMOZ_SHARED_ICU
|
DEFINES += -DMOZ_SHARED_ICU
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -101,6 +101,7 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef MOZ_NATIVE_ICU
|
||||||
#ifdef MOZ_SHARED_ICU
|
#ifdef MOZ_SHARED_ICU
|
||||||
#ifdef XP_WIN
|
#ifdef XP_WIN
|
||||||
#ifdef MOZ_DEBUG
|
#ifdef MOZ_DEBUG
|
||||||
|
@ -122,6 +123,7 @@
|
||||||
@BINPATH@/libicuuc.so.@MOZ_ICU_VERSION@
|
@BINPATH@/libicuuc.so.@MOZ_ICU_VERSION@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
[browser]
|
[browser]
|
||||||
; [Base Browser Files]
|
; [Base Browser Files]
|
||||||
|
|
Загрузка…
Ссылка в новой задаче