| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From c10368b397483a2fc7b493c099d8416d902f8cd8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 31 Jul 2018 14:18:35 +0800 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 4 | Subject: [PATCH] allow multi definitions for native |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | It fails to create .so file when build efivar-native: |
| 9 | |
| 10 | | lib.o:(*IND*+0x0): multiple definition of `efi_set_variable' |
| 11 | | lib.o:lib.c:(.text+0xa0): first defined here |
| 12 | |
| 13 | Add link option '-z muldefs' to fix it. |
| 14 | |
| 15 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 16 | |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 17 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 18 | --- |
| 19 | Make.rules | 1 + |
| 20 | 1 file changed, 1 insertion(+) |
| 21 | |
| 22 | diff --git a/Make.rules b/Make.rules |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 23 | index 042585b..257ba45 100644 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 24 | --- a/Make.rules |
| 25 | +++ b/Make.rules |
| 26 | @@ -20,6 +20,7 @@ include $(TOPDIR)/Make.version |
| 27 | $(CCLD) $(ccldflags) $(CPPFLAGS) $(SOFLAGS) \ |
| 28 | -Wl,-soname,$@.1 \ |
| 29 | -Wl,--version-script=$(MAP) \ |
| 30 | + -Wl,-z,muldefs \ |
| 31 | -o $@ $^ $(LDLIBS) |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 32 | ln -vfs $@ $@.1 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 33 | |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 34 | -- |
| 35 | 2.7.4 |
| 36 | |