Bug 1806470 - Still set some build-id on local builds. r=firefox-build-system-reviewers,andi

Bug 1796518 removed the build-id on local builds because it's faster to
do so, but it may be desirable to still have /some/ build-id, even if
it's random, so use a uuid on local builds instead of none at all.

Differential Revision: https://phabricator.services.mozilla.com/D166615
This commit is contained in:
Mike Hommey 2023-01-12 20:54:52 +00:00
parent 7de32ecbc5
commit 527cda6f68
2 changed files with 20 additions and 12 deletions

View File

@ -239,14 +239,18 @@ if test "$GNU_CC"; then
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)
# While sha1 is deterministic, it is slower.
if test -z "$DEVELOPER_OPTIONS" -o "$OS_TARGET" = "Android"; then
AC_MSG_CHECKING([for --build-id=sha1 option to ld])
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--build-id=sha1"
AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)
build_id=sha1
else
build_id=uuid
fi
AC_MSG_CHECKING([for --build-id=$build_id option to ld])
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--build-id=$build_id"
AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)
_DEFINES_CFLAGS="-include $jsconfdefs -DMOZILLA_CLIENT"
fi

View File

@ -253,14 +253,18 @@ if test "$GNU_CC"; then
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)
# While sha1 is deterministic, it is slower.
if test -z "$DEVELOPER_OPTIONS" -o "$OS_TARGET" = "Android"; then
AC_MSG_CHECKING([for --build-id=sha1 option to ld])
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--build-id=sha1"
AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)
build_id=sha1
else
build_id=uuid
fi
AC_MSG_CHECKING([for --build-id=$build_id option to ld])
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--build-id=$build_id"
AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)
AC_MSG_CHECKING([for --ignore-unresolved-symbol option to ld])
HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED=