wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 23:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

MoonchildProductions#1251 - Part 18: (Hopefully) final version of build system fixes.

Browse source 
I hope I can just apply these nice, clean changes and have everything work without having to make a mess again.
This commit is contained in:
athenian200 2019-10-02 20:36:49 -05:00 • committed by Roy Tam
commit 84f95c4d6d
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
old-configure.in
View file

@ -1206,6 +1206,10 @@ case "$target" in
fi fi
;; ;;
*-solaris*
MOZ_FIX_LINK_PATHS="-L${DIST}/bin"
;;
esac esac
AC_SUBST_LIST(MMX_FLAGS) AC_SUBST_LIST(MMX_FLAGS)

10
toolkit/library/libxul.mk
View file

@ -26,10 +26,10 @@ endif
endif endif
endif endif
# Generate GDB pretty printer-autoload files only on Linux. OSX's GDB is # Generate GDB pretty printer-autoload files on Linux and Solaris. OSX's GDB is
# too old to support Python pretty-printers; if this changes, we could make # too old to support Python pretty-printers; if this changes, we could make
# this 'ifdef GNU_CC'. # this 'ifdef GNU_CC'.
ifeq (Linux,$(OS_ARCH)) ifeq (,$(filter-out SunOS Linux,$(OS_ARCH)))
# Create a GDB Python auto-load file alongside the libxul shared library in # Create a GDB Python auto-load file alongside the libxul shared library in
# the build directory. # the build directory.
PP_TARGETS += LIBXUL_AUTOLOAD PP_TARGETS += LIBXUL_AUTOLOAD
@ -37,6 +37,10 @@ LIBXUL_AUTOLOAD = $(topsrcdir)/toolkit/library/libxul.so-gdb.py.in
LIBXUL_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir)) LIBXUL_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir))
endif endif
ifeq ($(OS_ARCH),SunOS)
OS_LDFLAGS += -Wl,-z,defs
endif
# BFD ld doesn't create multiple PT_LOADs as usual when an unknown section # BFD ld doesn't create multiple PT_LOADs as usual when an unknown section
# exists. Using an implicit linker script to make it fold that section in # exists. Using an implicit linker script to make it fold that section in
# .data.rel.ro makes it create multiple PT_LOADs. That implicit linker # .data.rel.ro makes it create multiple PT_LOADs. That implicit linker
@ -60,6 +64,6 @@ endif
LOCAL_CHECKS = test "$$($(get_first_and_last) | xargs echo)" != "start_kPStaticModules_NSModule end_kPStaticModules_NSModule" && echo "NSModules are not ordered appropriately" && exit 1 || exit 0 LOCAL_CHECKS = test "$$($(get_first_and_last) | xargs echo)" != "start_kPStaticModules_NSModule end_kPStaticModules_NSModule" && echo "NSModules are not ordered appropriately" && exit 1 || exit 0
ifeq (Linux,$(OS_ARCH)) ifeq (,$(filter-out SunOS Linux,$(OS_ARCH)))
LOCAL_CHECKS += ; test "$$($(TOOLCHAIN_PREFIX)readelf -l $1 | awk '$1 == "LOAD" { t += 1 } END { print t }')" -le 1 && echo "Only one PT_LOAD segment" && exit 1 || exit 0 LOCAL_CHECKS += ; test "$$($(TOOLCHAIN_PREFIX)readelf -l $1 | awk '$1 == "LOAD" { t += 1 } END { print t }')" -le 1 && echo "Only one PT_LOAD segment" && exit 1 || exit 0
endif endif