| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Fix nss multilib build on openSUSE 11.x 32bit |
| 2 | |
| 3 | While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will |
| 4 | fail with error: |
| 5 | |
| 6 | * nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled |
| 7 | |
| 8 | It caused by the '-m64' option which passed to host gcc. |
| 9 | |
| 10 | The nsinstall was built first while nss starting to build, it only runs |
| 11 | on host to install built files, it doesn't need any cross-compling or |
| 12 | multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this |
| 13 | error. |
| 14 | |
| 15 | Upstream-Status: Pending |
| 16 | |
| 17 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
| 18 | =================================================== |
| 19 | diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile |
| 20 | index 1850bcb..5aee84f 100644 |
| 21 | --- a/nss/coreconf/nsinstall/Makefile |
| 22 | +++ b/nss/coreconf/nsinstall/Makefile |
| 23 | @@ -18,6 +18,12 @@ INTERNAL_TOOLS = 1 |
| 24 | |
| 25 | include $(DEPTH)/coreconf/config.mk |
| 26 | |
| 27 | +# nsinstall is unfit for cross-compiling/multilib-build since it was |
| 28 | +# always run on local host to install built files. This change intends |
| 29 | +# to clean the '-m64' from ARCHFLAG and LDFLAGS. |
| 30 | +ARCHFLAG = |
| 31 | +LDFLAGS = |
| 32 | + |
| 33 | ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) |
| 34 | PROGRAM = |
| 35 | else |