mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-19 10:34:38 +02:00
8135060: Stop building Xcode projects in install build
Reviewed-by: ihse, pbhat, dmalav
This commit is contained in:
parent
209f1b7d18
commit
8f85a8ae8d
8 changed files with 45 additions and 17 deletions
|
@ -60,7 +60,7 @@ RM="@RM@"
|
|||
SED="@SED@"
|
||||
SORT="@SORT@"
|
||||
STAT="@STAT@"
|
||||
STRIP="@POST_STRIP_CMD@"
|
||||
STRIP="@STRIP@ @STRIPFLAGS@"
|
||||
TEE="@TEE@"
|
||||
UNIQ="@UNIQ@"
|
||||
UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200"
|
||||
|
|
|
@ -60,10 +60,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
|
|||
STRIPFLAGS="-X32_64"
|
||||
fi
|
||||
|
||||
if test "x$OPENJDK_TARGET_OS" != xwindows; then
|
||||
POST_STRIP_CMD="$STRIP $STRIPFLAGS"
|
||||
fi
|
||||
AC_SUBST(POST_STRIP_CMD)
|
||||
AC_SUBST(STRIPFLAGS)
|
||||
|
||||
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
|
||||
CC_OUT_OPTION=-Fo
|
||||
|
|
|
@ -735,7 +735,7 @@ AR_OUT_OPTION
|
|||
LD_OUT_OPTION
|
||||
EXE_OUT_OPTION
|
||||
CC_OUT_OPTION
|
||||
POST_STRIP_CMD
|
||||
STRIPFLAGS
|
||||
ARFLAGS
|
||||
COMPILER_TARGET_BITS_FLAG
|
||||
JT_HOME
|
||||
|
@ -4359,7 +4359,7 @@ VS_SDK_PLATFORM_NAME_2013=
|
|||
#CUSTOM_AUTOCONF_INCLUDE
|
||||
|
||||
# Do not change or remove the following line, it is needed for consistency checks:
|
||||
DATE_WHEN_GENERATED=1441958217
|
||||
DATE_WHEN_GENERATED=1442448271
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
|
@ -41053,9 +41053,6 @@ $as_echo "$tool_specified" >&6; }
|
|||
STRIPFLAGS="-X32_64"
|
||||
fi
|
||||
|
||||
if test "x$OPENJDK_TARGET_OS" != xwindows; then
|
||||
POST_STRIP_CMD="$STRIP $STRIPFLAGS"
|
||||
fi
|
||||
|
||||
|
||||
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
|
||||
|
|
|
@ -416,7 +416,7 @@ STATIC_LIBRARY_SUFFIX:=@STATIC_LIBRARY_SUFFIX@
|
|||
EXE_SUFFIX:=@EXE_SUFFIX@
|
||||
OBJ_SUFFIX:=@OBJ_SUFFIX@
|
||||
|
||||
POST_STRIP_CMD:=@POST_STRIP_CMD@
|
||||
STRIPFLAGS:=@STRIPFLAGS@
|
||||
|
||||
JAVA_FLAGS:=@JAVA_FLAGS@
|
||||
JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@
|
||||
|
|
|
@ -590,7 +590,7 @@ compare_bin_file() {
|
|||
ORIG_THIS_FILE="$THIS_FILE"
|
||||
ORIG_OTHER_FILE="$OTHER_FILE"
|
||||
|
||||
if [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then
|
||||
if [ "$STRIP_ALL" = "true" ] || [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then
|
||||
THIS_STRIPPED_FILE=$FILE_WORK_DIR/this/$NAME
|
||||
OTHER_STRIPPED_FILE=$FILE_WORK_DIR/other/$NAME
|
||||
$MKDIR -p $FILE_WORK_DIR/this $FILE_WORK_DIR/other
|
||||
|
@ -1015,6 +1015,8 @@ if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1
|
|||
echo "-vv More verbose output, shows diff output of all comparisons"
|
||||
echo "-o [OTHER] Compare with build in other directory. Will default to the old build directory"
|
||||
echo ""
|
||||
echo "--strip Strip all binaries before comparing"
|
||||
echo ""
|
||||
echo "[FILTER] List filenames in the image to compare, works for jars, zips, libs and execs"
|
||||
echo "Example:"
|
||||
echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
|
||||
|
@ -1107,6 +1109,9 @@ while [ -n "$1" ]; do
|
|||
shift
|
||||
shift
|
||||
;;
|
||||
--strip)
|
||||
STRIP_ALL=true
|
||||
;;
|
||||
*)
|
||||
CMP_NAMES=false
|
||||
CMP_PERMS=false
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue