e7a09764c4
- Update to 3.0.11 (via patches generated from git) - Plus newer upstream fixes (also via patches generated from git) - Fix shell exit failures in make - Fix .reloc section generation - Fix CHAR8 definition - Fix "make DESTDIR=..." - Change the installed .a/.o layout - Provide makefiles for consumers to use. - Make the -devel noarch since it's just headers. - Add a bunch of compatibility symlinks for our older packages. These will go away once we've migrated everything using them in fedora to use the newer make system... Signed-off-by: Peter Jones <pjones@redhat.com>
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From de4e5e4e3b6faaf05b0b9a9a7ead882269078dc3 Mon Sep 17 00:00:00 2001
|
|
From: Nigel Croxon <ncroxon@redhat.com>
|
|
Date: Fri, 15 Mar 2019 09:48:10 -0400
|
|
Subject: [PATCH 07/45] Make.rules incomplete/wrong; make -r failure
|
|
|
|
Make.rules is not complete; in particular it lacks a %.o: %.S rule.
|
|
This happens to work due to the builtin make rule to that effect. but
|
|
building with make -r, or building as a sub-make of an environment that
|
|
uses make -r (or MAKEFLAGS += -r) causes it to break.
|
|
|
|
In general, make -r is strongly preferred, and Make.rules seems to have
|
|
been created explicitly to support this.
|
|
|
|
To further complicate things, the rule %.S: %.c causes a completely
|
|
incomprehensible error message. This rule is wrong, it should be %.s:
|
|
%.c not %.S: %.c.
|
|
|
|
Finally, the rule %.E: %.c is normally %.i: %.c; .i is the normal
|
|
extension for preprocessed C source. The equivalent rule for assembly is
|
|
%.s: %.S.
|
|
|
|
Signed-off-by: H. Peter Anvin <hpa@users.sf.net>
|
|
Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
|
|
---
|
|
Make.rules | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Make.rules b/Make.rules
|
|
index 5b1c2862e1b..8cb93b0a039 100644
|
|
--- a/Make.rules
|
|
+++ b/Make.rules
|
|
@@ -51,8 +51,14 @@
|
|
%.o: %.c
|
|
$(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
|
|
|
|
-%.S: %.c
|
|
+%.s: %.c
|
|
$(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -S $< -o $@
|
|
|
|
-%.E: %.c
|
|
+%.i: %.c
|
|
+ $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -E $< -o $@
|
|
+
|
|
+%.o: %.S
|
|
+ $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
|
|
+
|
|
+%.s: %.S
|
|
$(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -E $< -o $@
|
|
--
|
|
2.24.1
|
|
|