Mercurial > hg > openjdk > jdk8
changeset 598:0d4b0a13adb2
8005855: build-infra: Remove -R flag when cross compiling
Reviewed-by: dholmes, tbell
| author | erikj |
|---|---|
| date | Wed, 23 Jan 2013 11:37:36 +0100 |
| parents | edad83acbd46 |
| children | ea6379d4624f |
| files | common/autoconf/generated-configure.sh common/autoconf/libraries.m4 |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Fri Jan 18 16:48:25 2013 +0100 +++ b/common/autoconf/generated-configure.sh Wed Jan 23 11:37:36 2013 +0100 @@ -3723,7 +3723,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1358499442 +DATE_WHEN_GENERATED=1358937404 ############################################################################### # @@ -29247,6 +29247,12 @@ fi +# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling +# this doesn't make sense so we remove it. +if test "x$COMPILE_TYPE" = xcross; then + X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'` +fi + if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then # Print a helpful message on how to acquire the necessary build dependency.
--- a/common/autoconf/libraries.m4 Fri Jan 18 16:48:25 2013 +0100 +++ b/common/autoconf/libraries.m4 Wed Jan 23 11:37:36 2013 +0100 @@ -136,6 +136,12 @@ AC_PATH_X AC_PATH_XTRA +# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling +# this doesn't make sense so we remove it. +if test "x$COMPILE_TYPE" = xcross; then + X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'` +fi + if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then HELP_MSG_MISSING_DEPENDENCY([x11]) AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])