55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
|
From ff939c5063d8f8d444bdb25651a0a48e608efaa4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Khem Raj <raj.khem@gmail.com>
|
||
|
|
Date: Fri, 20 Feb 2015 11:17:19 +0000
|
||
|
|
Subject: [PATCH 32/46] gcc 4.8+ won't build with --disable-dependency-tracking
|
||
|
|
|
||
|
|
since the *.Ppo files don't get created unless --enable-dependency-tracking is true.
|
||
|
|
|
||
|
|
This patch ensures we only use those compiler options when its enabled.
|
||
|
|
|
||
|
|
Upstream-Status: Submitted
|
||
|
|
|
||
|
|
(Problem was already reported upstream, attached this patch there
|
||
|
|
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55930)
|
||
|
|
|
||
|
|
RP
|
||
|
|
2012/09/22
|
||
|
|
|
||
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||
|
|
---
|
||
|
|
libatomic/Makefile.am | 3 ++-
|
||
|
|
libatomic/Makefile.in | 3 ++-
|
||
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
|
||
|
|
index b351244..399ce18 100644
|
||
|
|
--- a/libatomic/Makefile.am
|
||
|
|
+++ b/libatomic/Makefile.am
|
||
|
|
@@ -101,7 +101,8 @@ PAT_S = $(word 3,$(PAT_SPLIT))
|
||
|
|
IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
|
||
|
|
IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
|
||
|
|
|
||
|
|
-M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
|
||
|
|
+@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
|
||
|
|
+@AMDEP_FALSE@M_DEPS =
|
||
|
|
M_SIZE = -DN=$(PAT_N)
|
||
|
|
M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
|
||
|
|
M_FILE = $(PAT_BASE)_n.c
|
||
|
|
diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
|
||
|
|
index a083d87..a92cfce 100644
|
||
|
|
--- a/libatomic/Makefile.in
|
||
|
|
+++ b/libatomic/Makefile.in
|
||
|
|
@@ -330,7 +330,8 @@ PAT_N = $(word 2,$(PAT_SPLIT))
|
||
|
|
PAT_S = $(word 3,$(PAT_SPLIT))
|
||
|
|
IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
|
||
|
|
IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
|
||
|
|
-M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
|
||
|
|
+@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
|
||
|
|
+@AMDEP_FALSE@M_DEPS =
|
||
|
|
M_SIZE = -DN=$(PAT_N)
|
||
|
|
M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
|
||
|
|
M_FILE = $(PAT_BASE)_n.c
|
||
|
|
--
|
||
|
|
2.8.2
|
||
|
|
|