23059422 firefox/thunderbird should use the supplied compiler
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Sun, 03 Apr 2016 21:48:42 -0700
changeset 5786 5754dc3ac5eb
parent 5785 44986b974b10
child 5787 c0615d62b41a
23059422 firefox/thunderbird should use the supplied compiler
components/desktop/firefox/Makefile
components/desktop/firefox/patches/firefox-49-freebl-as.patch
components/desktop/thunderbird/Makefile
--- a/components/desktop/firefox/Makefile	Thu Apr 07 22:35:46 2016 -0700
+++ b/components/desktop/firefox/Makefile	Sun Apr 03 21:48:42 2016 -0700
@@ -76,7 +76,7 @@
 
 # /usr/gnu/bin needed to pick up the GNU version of tail and readelf.
 # /usr/sbin needed for dtrace.
-PATH =			/usr/gnu/bin:/usr/bin:/usr/sbin
+PATH =			$(dirname $(CC)):/usr/gnu/bin:/usr/bin:/usr/sbin
 
 CLEAN_PATHS +=		$(COMPONENT_SRC)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/firefox/patches/firefox-49-freebl-as.patch	Sun Apr 03 21:48:42 2016 -0700
@@ -0,0 +1,17 @@
+#
+# Building freebl should use the supplied top level compiler to drive the
+# assembler and not whichever gcc it happens to pick up.
+#
+--- a/security/nss/lib/freebl/Makefile	Mon Dec 21 14:32:54 2015
++++ b/security/nss/lib/freebl/Makefile	Sun Apr  3 18:03:44 2016
[email protected]@ -426,8 +426,8 @@
+ else
+     # Solaris for non-sparc family CPUs
+     ifdef NS_USE_GCC
+-	LD = gcc
+-	AS = gcc
++	LD = $(CC)
++	AS = $(CC)
+ 	ASFLAGS = -x assembler-with-cpp
+     endif
+     ifeq ($(USE_64),1)
--- a/components/desktop/thunderbird/Makefile	Thu Apr 07 22:35:46 2016 -0700
+++ b/components/desktop/thunderbird/Makefile	Sun Apr 03 21:48:42 2016 -0700
@@ -94,7 +94,7 @@
 include $(WS_MAKE_RULES)/ips.mk
 
 # /usr/sbin needed for dtrace.
-PATH =         /usr/gnu/bin:/usr/bin:/usr/sbin
+PATH =         $(dirname $(CC)):/usr/gnu/bin:/usr/bin:/usr/sbin
 
 MOZCONFIG =	$(BUILD_DIR_32)/mozconfig