commit 8c77f817e112ea603b7f27936e631f7d365dd9d6
parent 866e3560b2613aa9e3db72a8681166e638bfed28
Author: serge-sans-paille <sguelton@mozilla.com>
Date: Tue, 4 Nov 2025 09:11:23 +0000
Bug 1995553 - Remove obsolete GNU make commands from js/src/{.,build}/Makefile.in r=glandium
The last reference to DASH_R was in Bug 680792, and it was also a
removal. Otherwise it dates back to the hg import in 2007.
There's no HOST_SIMPLE_PROGRAMS in js/src/*, so USE_HOST_CXX is
irrelevant.
ZLIB flags can be added from moz.build. Note that Makefile.in used to
impact CFLAGS while it should have impacted CXXFLAGS, and that it was
mostly working because in the end, we always use the one from
~/.mozbuild system and not the actual user system.
The renaming of .pc looks like a circular dependency likely to be
ignored by make. LIBRARY_NAME is always js. It's probably a leftover
from from before JS_LIBRARY_NAME was added.
It does not seem correct to add optimization specific to a specific
SunOS/Sparc CPU in a Makefile.in. It's something that should be passed
to moz.configure, or detected during configuration step. Plus it's a
tier3 target so we're not going to keep arch-specific stuff in
Makefile.in for those.
Differential Revision: https://phabricator.services.mozilla.com/D269408
Diffstat:
3 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
@@ -4,27 +4,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-DASH_R = -r
-
-# Define keyword generator before rules.mk, see bug 323979 comment 50
-
-USE_HOST_CXX = 1
-
include $(topsrcdir)/config/rules.mk
-CFLAGS += $(MOZ_ZLIB_CFLAGS)
-
-ifeq ($(OS_ARCH),SunOS)
-ifeq ($(TARGET_CPU),sparc)
-
-ifneq ($(CC_TYPE),clang-cl)
-CFLAGS += -mcpu=v9
-CXXFLAGS += -mcpu=v9
-endif # !clang-cl
-
-endif
-endif
-
install::
$(MAKE) -C build install
$(MAKE) -C shell install
diff --git a/js/src/build/Makefile.in b/js/src/build/Makefile.in
@@ -6,9 +6,6 @@
include $(topsrcdir)/config/rules.mk
-$(LIBRARY_NAME).pc: js.pc
- cp $^ $@
-
# Install versioned file, for parallel installability in Linux distributions
install:: $(LIBRARY_NAME).pc
cp $^ $(JS_LIBRARY_NAME).pc
diff --git a/js/src/moz.build b/js/src/moz.build
@@ -574,6 +574,8 @@ if CONFIG["JS_HAS_INTL_API"]:
if CONFIG["CC_TYPE"] == "clang":
CXXFLAGS += ["-fstandalone-debug"]
+CXXFLAGS += CONFIG["MOZ_ZLIB_CFLAGS"]
+
# Bug 1722102 - This should never be enabled in Release without explicit
# security and SpiderMonkey review.
# See https://bugzilla.mozilla.org/show_bug.cgi?id=1722102#c16
