stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8003300: build-infra: fails on solaris when objcopy is not found

Browse Source 
Only call BASIC_FIXUP_EXECUTABLE() if objcopy was found.

Reviewed-by: tbell
This commit is contained in:
Erik Joelsson 2012-11-19 14:06:30 -08:00 committed by Tim Bell
parent 19c725d07b
commit 4850bec745
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/autoconf/generated-configure.sh
View File

@ -3068,7 +3068,7 @@ fi
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1352917083
DATE_WHEN_GENERATED=1353361797
###############################################################################
#
@ -26313,6 +26313,8 @@ esac
fi
fi
# Only call fixup if objcopy was found.
if test -n "$OBJCOPY"; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
@ -26576,6 +26578,7 @@ $as_echo "$as_me: error: Cannot locate the the path of OBJCOPY" >&2;}
$as_echo "$as_me: Rewriting OBJCOPY to \"$new_complete\"" >&6;}
fi
fi
fi
if test -n "$ac_tool_prefix"; then

5
common/autoconf/toolchain.m4
View File

@ -437,7 +437,10 @@ fi
# full debug symbols are enabled.
if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
BASIC_FIXUP_EXECUTABLE(OBJCOPY)
# Only call fixup if objcopy was found.
if test -n "$OBJCOPY"; then
BASIC_FIXUP_EXECUTABLE(OBJCOPY)
fi
fi
AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])