| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From a452138a1dd274bfad381a701729783360dc86fb Mon Sep 17 00:00:00 2001 |
| 2 | From: Maciej Borzecki <maciej.borzecki@open-rnd.pl> |
| 3 | Date: Tue, 5 Jan 2016 22:04:17 +0100 |
| 4 | Subject: [PATCH] fix cross compilation on i586 targets |
| 5 | |
| 6 | Remove offending -Wl,-rpath-link that may cause host libraries to be picked |
| 7 | during linking. The patch applies a fix to configure.in. So as not to |
| 8 | regenerate configure, similar fix is applied there. |
| 9 | |
| 10 | Upstream-Status: Inappropriate [embedded specific] |
| 11 | |
| 12 | Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl> |
| 13 | --- |
| 14 | js/src/configure | 2 +- |
| 15 | js/src/configure.in | 2 +- |
| 16 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/js/src/configure b/js/src/configure |
| 19 | index d019b0fdba44233596541de94307010d85a8e32e..5aa40f757a3dbb7d6887175046f44212c15c2eac 100755 |
| 20 | --- a/js/src/configure |
| 21 | +++ b/js/src/configure |
| 22 | @@ -5555,7 +5555,7 @@ TARGET_MD_ARCH=unix |
| 23 | DIRENT_INO=d_ino |
| 24 | MOZ_USER_DIR=".mozilla" |
| 25 | |
| 26 | -MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' |
| 27 | +MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin' |
| 28 | |
| 29 | MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' |
| 30 | |
| 31 | diff --git a/js/src/configure.in b/js/src/configure.in |
| 32 | index 0673aca12f6d83035549ade2a4a83906bf91f0f0..39b22724f9535ac1a6dba04658c91e4ef667fc47 100644 |
| 33 | --- a/js/src/configure.in |
| 34 | +++ b/js/src/configure.in |
| 35 | @@ -919,7 +919,7 @@ TARGET_MD_ARCH=unix |
| 36 | DIRENT_INO=d_ino |
| 37 | MOZ_USER_DIR=".mozilla" |
| 38 | |
| 39 | -MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' |
| 40 | +MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin' |
| 41 | |
| 42 | MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' |
| 43 | |
| 44 | -- |
| 45 | 2.5.0 |
| 46 | |