From 0f67e8e976c9ae87cf59a52b8d31a43f7311c0c7 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 20 Aug 2013 15:21:45 +0900 Subject: [PATCH] Bug 905938 - Cancel GNU make builtin implicit rules by forcing -r instead of adding implicit rules to cancel them out. r=gps --- config/rules.mk | 15 ++++----------- js/src/config/rules.mk | 15 ++++----------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/config/rules.mk b/config/rules.mk index 5f122b809874..a742374f23f7 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -1216,17 +1216,10 @@ else endif endif -# Cancel these implicit rules -# -%: %,v - -%: RCS/%,v - -%: RCS/% - -%: s.% - -%: SCCS/s.% +# Cancel GNU make built-in implicit rules +ifndef .PYMAKE +MAKEFLAGS += -r +endif ############################################################################### # Java rules diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index 5f122b809874..a742374f23f7 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -1216,17 +1216,10 @@ else endif endif -# Cancel these implicit rules -# -%: %,v - -%: RCS/%,v - -%: RCS/% - -%: s.% - -%: SCCS/s.% +# Cancel GNU make built-in implicit rules +ifndef .PYMAKE +MAKEFLAGS += -r +endif ############################################################################### # Java rules