зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1553938 - Ensure js-confdefs.h is installed and included. r=sfink
js-confdefs.h contains defines that affect the size and layout of public structures, so it should always be included. It already brings in js/RequiredDefines.h itself, so that no longer needs to be explicitly included. Differential Revision: https://phabricator.services.mozilla.com/D35448 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
10e6095df1
Коммит
4a11d8fbbd
|
@ -30,8 +30,9 @@ install:: $(LIBRARY_NAME).pc
|
|||
cp $^ $(JS_LIBRARY_NAME).pc
|
||||
$(SYSINSTALL) $(JS_LIBRARY_NAME).pc $(DESTDIR)$(libdir)/pkgconfig
|
||||
|
||||
install:: ../js-config.h
|
||||
$(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(JS_LIBRARY_NAME)
|
||||
install:: ../js-config.h ../js-confdefs.h
|
||||
$(SYSINSTALL) -m644 ../js-config.h $(DESTDIR)$(includedir)/$(JS_LIBRARY_NAME)
|
||||
$(SYSINSTALL) -m644 ../js-confdefs.h $(DESTDIR)$(includedir)/$(JS_LIBRARY_NAME)
|
||||
|
||||
######################################################
|
||||
# BEGIN SpiderMonkey header installation
|
||||
|
|
|
@ -108,7 +108,7 @@ if test "$echo_libdir" = "yes"; then
|
|||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
echo "-std=gnu++11 -include $includedir/$JS_LIBRARY_NAME/js/RequiredDefines.h -I$includedir/$JS_LIBRARY_NAME $NSPR_CFLAGS"
|
||||
echo "-std=gnu++11 -include $includedir/$JS_LIBRARY_NAME/js-confdefs.h -isystem $includedir/$JS_LIBRARY_NAME $NSPR_CFLAGS"
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
|
|
|
@ -11,4 +11,4 @@ Libs: -L${libdir} -l@JS_LIBRARY_NAME@
|
|||
# Use -isystem for includes rather than -I, to mark them as "system headers"
|
||||
# that don't generate warning diagnostics. For justification, see
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1539036
|
||||
Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -isystem ${includedir}/@JS_LIBRARY_NAME@
|
||||
Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js-confdefs.h -isystem ${includedir}/@JS_LIBRARY_NAME@
|
||||
|
|
Загрузка…
Ссылка в новой задаче