Date: Mon, 13 Apr 2026 14:16:33 +0000 From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d87609e18ef7 - main - */*: remove checks that base ld is(n't) GNU ld Message-ID: <69dcfac1.46313.295059c6@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=d87609e18ef784cd390f651b1ac8ab6e490e744f commit d87609e18ef784cd390f651b1ac8ab6e490e744f Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2026-04-13 14:13:12 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2026-04-13 14:13:12 +0000 */*: remove checks that base ld is(n't) GNU ld GNU binutils was removed entierly prior to 13.0 so assume /usr/bin/ld is LLD. Sponsored by: DARPA, AFRL Reviewed by: arrowd, bapt Approved by: portmgr (bapt) Differential Revision: https://reviews.freebsd.org/D55691 --- Mk/bsd.gecko.mk | 5 ----- Mk/bsd.port.mk | 2 +- audio/faust-lv2/Makefile | 2 -- devel/dconf/Makefile | 4 ---- devel/mpatrol/Makefile | 2 -- math/p5-PDL/Makefile | 2 -- net-im/uTox/Makefile | 2 -- 7 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 66ec6fed7527..2b93bb32c348 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -207,11 +207,6 @@ MOZ_EXPORT+= MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}" MOZ_OPTIONS+= --enable-optimize . else MOZ_OPTIONS+= --disable-optimize -. if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld -# ld 2.17 barfs on Stylo built with -C opt-level=0 -USE_BINUTILS= yes -LDFLAGS+= -B${LOCALBASE}/bin -. endif . endif . if ${PORT_OPTIONS:MCANBERRA} diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index e7c9e3ac78d9..249b7ce7e40e 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1847,7 +1847,7 @@ PKG_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PKG_ORIGIN} .include "${PORTSDIR}/Mk/bsd.gcc.mk" . endif -. if defined(LLD_UNSAFE) && ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld +. if defined(LLD_UNSAFE) LDFLAGS+= -fuse-ld=bfd BINARY_ALIAS+= ld=${LD} USE_BINUTILS= yes diff --git a/audio/faust-lv2/Makefile b/audio/faust-lv2/Makefile index 9d0560c8b9b3..df831674249c 100644 --- a/audio/faust-lv2/Makefile +++ b/audio/faust-lv2/Makefile @@ -12,9 +12,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_aarch64= fails to link: can't create dynamic relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol: vtable for LV2UI in readonly segment -.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld BROKEN_i386= ld: error: can't create dynamic relocation R_386_32 against symbol: vtable for LV2UI in readonly segment -.endif BROKEN_riscv64= can't create dynamic relocation R_RISCV_LO12_I against symbol: vtable for LV2UI in readonly segment; recompile object files with -fPIC or pass '-Wl,-z,notext' to allow text relocations in the output BUILD_DEPENDS= lv2>0:audio/lv2 \ diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index cee81577421c..820b4d921ff5 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -20,10 +20,6 @@ USES= gettext gnome localbase meson pkgconfig python:build \ USE_CSTD= c99 USE_GNOME= glib20 libxslt:build USE_LDCONFIG= yes -.if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld -USE_BINUTILS= yes -LDFLAGS+= -B${LOCALBASE}/bin -.endif SHEBANG_FILES= tests/test-dconf.py BINARY_ALIAS= python3=${PYTHON_VERSION} diff --git a/devel/mpatrol/Makefile b/devel/mpatrol/Makefile index c46aed24fc72..966121b3f030 100644 --- a/devel/mpatrol/Makefile +++ b/devel/mpatrol/Makefile @@ -13,9 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../../COPYING ONLY_FOR_ARCHS= amd64 i386 -.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld BROKEN_i386= ld: error: relocation R_386_PC32 cannot be used against symbol __mp_init -.endif LIB_DEPENDS= libelf.so.0:devel/libelf diff --git a/math/p5-PDL/Makefile b/math/p5-PDL/Makefile index 9ff6c2328b6a..cca3d7398212 100644 --- a/math/p5-PDL/Makefile +++ b/math/p5-PDL/Makefile @@ -13,9 +13,7 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual BROKEN_aarch64= ld: error: relocation R_AARCH64_ADR_PREL_PG_HI21 cannot be used against symbol __stack_chk_guard; recompile with -fPIC -.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld BROKEN_i386= ld: error: can't create dynamic relocation R_386_32 against local symbol in readonly segment; recompile object files with -fPIC or pass '-Wl,-z,notext' to allow text relocations in the output -.endif BUILD_DEPENDS= p5-Devel-CheckLib>=1.01:devel/p5-Devel-CheckLib \ ${RUN_DEPENDS} diff --git a/net-im/uTox/Makefile b/net-im/uTox/Makefile index c00c02e0153a..84df1c07d84c 100644 --- a/net-im/uTox/Makefile +++ b/net-im/uTox/Makefile @@ -36,7 +36,6 @@ OPTIONS_DEFAULT= DBUS DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CMAKE_BOOL= ENABLE_DBUS -.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld # ld.lld lacks default output emulation. Using -b binary without # explicit -m will fail. Mapping taken from lld/ELF/Driver.cpp. _LLD_EMUL_aarch64= aarch64elf_fbsd @@ -51,7 +50,6 @@ _LLD_EMUL_powerpc64le= elf64lppc_fbsd post-patch: @${REINPLACE_CMD} 's,[[:<:]]ld[[:>:]],ld -m${_LLD_EMUL_${ARCH}},' \ ${WRKSRC}/src/xlib/CMakeLists.txt -.endif do-test: @cd ${TEST_WRKSRC} && \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69dcfac1.46313.295059c6>