summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErico Nunes <nunes.erico@gmail.com>2016-06-28 21:25:20 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-07-01 16:19:27 +0200
commit0cf4e05832dbc1e87b06f4f39628c30dd9734f23 (patch)
treea7802c4f30c7471f83dde3a52b2218befd676485
parent8f7203cd5453c93b6b1d6afb9ce4634ec0d9ac7a (diff)
downloadbuildroot-0cf4e05832dbc1e87b06f4f39628c30dd9734f23.tar.gz
buildroot-0cf4e05832dbc1e87b06f4f39628c30dd9734f23.zip
efivar: force shared libgcc for Nios II
efivar for Nios II also has to be linked with shared libgcc to avoid an error due to FDE encoding in static libgcc when linking libefiboot.so. Fixes: http://autobuild.buildroot.net/results/0c9/0c90e3e7ad41d21dd832f6f266af35fc19185170/ Signed-off-by: Erico Nunes <nunes.erico@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/efivar/efivar.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk
index de48bc9971..cb5f7b65ef 100644
--- a/package/efivar/efivar.mk
+++ b/package/efivar/efivar.mk
@@ -21,9 +21,9 @@ EFIVAR_MAKE_OPTS = \
BINTARGETS=efivar \
LDFLAGS="$(TARGET_LDFLAGS) -fPIC"
-# Explicitly linking with shared libgcc is required on MicroBlaze,
-# otherwise it fails due to FDE encoding in static libgcc.
-ifeq ($(BR2_microblaze),y)
+# Explicitly linking with shared libgcc is required on MicroBlaze and
+# Nios II, otherwise it fails due to FDE encoding in static libgcc.
+ifeq ($(BR2_microblaze)$(BR2_nios2),y)
EFIVAR_MAKE_OPTS += SOFLAGS="-shared -shared-libgcc"
endif
OpenPOWER on IntegriCloud