зеркало из https://github.com/mozilla/pjs.git
Get NSS headers from the new location (dist/public/nss) only.
Modified files: boot/src/Makefile.in pki/src/Makefile.in ssl/src/Makefile.in
This commit is contained in:
Родитель
b347550fca
Коммит
111331eac0
|
@ -79,7 +79,6 @@ REQUIRES = nspr \
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
INCLUDES += \
|
INCLUDES += \
|
||||||
-I$(DIST)/public/security \
|
|
||||||
-I$(DIST)/public/nss \
|
-I$(DIST)/public/nss \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,6 @@ REQUIRES = nspr \
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
INCLUDES += \
|
INCLUDES += \
|
||||||
-I$(DIST)/public/security \
|
|
||||||
-I$(DIST)/public/nss \
|
-I$(DIST)/public/nss \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
|
@ -108,9 +108,7 @@ include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
# Use local includes because they are inserted before INCLUDES
|
# Use local includes because they are inserted before INCLUDES
|
||||||
# so that Mozilla's nss.h is used, not glibc's
|
# so that Mozilla's nss.h is used, not glibc's
|
||||||
LOCAL_INCLUDES += -I$(DIST)/public/security \
|
LOCAL_INCLUDES += -I$(DIST)/public/nss \
|
||||||
-I$(DIST)/private/security \
|
|
||||||
-I$(DIST)/public/nss \
|
|
||||||
-I$(DIST)/private/nss \
|
-I$(DIST)/private/nss \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче