summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2019-10-02 20:36:49 -0500
committerathenian200 <athenian200@outlook.com>2019-10-21 04:53:42 -0500
commit7e5ff857eefd66008c78f2bcda62b28316e71f09 (patch)
treeca4b594f07d446d1b753dec43111a7366d68b38b
parentbeea314ffe6c9cefeb232e9b38fcecf66154854f (diff)
downloadUXP-7e5ff857eefd66008c78f2bcda62b28316e71f09.tar
UXP-7e5ff857eefd66008c78f2bcda62b28316e71f09.tar.gz
UXP-7e5ff857eefd66008c78f2bcda62b28316e71f09.tar.lz
UXP-7e5ff857eefd66008c78f2bcda62b28316e71f09.tar.xz
UXP-7e5ff857eefd66008c78f2bcda62b28316e71f09.zip
MoonchildProductions#1251 - Part 18: (Hopefully) final version of build system fixes.
I hope I can just apply these nice, clean changes and have everything work without having to make a mess again.
-rw-r--r--old-configure.in4
-rw-r--r--toolkit/library/libxul.mk12
2 files changed, 12 insertions, 4 deletions
diff --git a/old-configure.in b/old-configure.in
index 1525ecc9b..f8fb9245b 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1197,6 +1197,10 @@ case "$target" in
fi
;;
+*-solaris*
+ MOZ_FIX_LINK_PATHS="-L${DIST}/bin"
+ ;;
+
esac
AC_SUBST_LIST(MMX_FLAGS)
diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk
index 9e7e8beee..8533a015d 100644
--- a/toolkit/library/libxul.mk
+++ b/toolkit/library/libxul.mk
@@ -4,7 +4,7 @@
EXTRA_DEPS += $(topsrcdir)/toolkit/library/libxul.mk
-ifeq (Linux,$(OS_ARCH))
+ifeq (Linux,$(OS_ARCH))
ifneq (Android,$(OS_TARGET))
OS_LDFLAGS += -Wl,-version-script,symverscript
@@ -16,10 +16,10 @@ EXTRA_DEPS += symverscript
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
# 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
# the build directory.
PP_TARGETS += LIBXUL_AUTOLOAD
@@ -27,6 +27,10 @@ LIBXUL_AUTOLOAD = $(topsrcdir)/toolkit/library/libxul.so-gdb.py.in
LIBXUL_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir))
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
# 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
@@ -50,6 +54,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
-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
endif