90e6999a07
- Update to the stuff in master to fix the issue at: https://bodhi.fedoraproject.org/updates/FEDORA-2020-050993b283#comment-1208958 - 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>
41 lines
1.0 KiB
Diff
41 lines
1.0 KiB
Diff
From a8738685ab5c3bc77ada50c1b859c98e7f6a70cb Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Wed, 15 Jan 2020 13:10:11 -0500
|
|
Subject: [PATCH 45/46] Use CFLAGS with "gcc -print-libgcc-file-name" to get
|
|
the right one.
|
|
|
|
This makes us use CFLAGS when trying to find libgcc, so we don't get the
|
|
one with the wrong endian or float ABI.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
Make.defaults | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Make.defaults b/Make.defaults
|
|
index 15af35e6e26..de88bcd0231 100755
|
|
--- a/Make.defaults
|
|
+++ b/Make.defaults
|
|
@@ -181,10 +181,6 @@ endif
|
|
endif
|
|
endif
|
|
|
|
-ifneq ($(ARCH),arm)
|
|
-export LIBGCC=$(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
|
|
-endif
|
|
-
|
|
ifeq ($(ARCH),arm)
|
|
CFLAGS += -marm
|
|
endif
|
|
@@ -223,3 +219,7 @@ endif
|
|
ASFLAGS += $(ARCH3264)
|
|
LDFLAGS += -nostdlib --warn-common --no-undefined --fatal-warnings \
|
|
--build-id=sha1
|
|
+
|
|
+ifneq ($(ARCH),arm)
|
|
+export LIBGCC=$(shell $(CC) $(CFLAGS) $(ARCH3264) -print-libgcc-file-name)
|
|
+endif
|
|
--
|
|
2.24.1
|
|
|