Skip to content

Commit 8982df0

Browse files
committed
rust: drop adding --enable-new-dtags
--enable-new-dtags is the default since Rust 1.7.0 due to rust-lang/rust#30378. Signed-off-by: Doug Goldstein <[email protected]>
1 parent d749cbb commit 8982df0

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

recipes-devtools/rust/rust.inc

+3-6
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,9 @@ TARGET_ENDIAN[i586] = "little"
123123
TARGET_POINTER_WIDTH[i586] = "32"
124124
PRE_LINK_ARGS[i586] = "-Wl,--as-needed -m32"
125125

126-
# enable-new-dtags causes rpaths to be inserted as DT_RUNPATH (as well as
127-
# DT_RPATH), which lets LD_LIBRARY_PATH override them
128-
RPATH_LDFLAGS = "-Wl,--enable-new-dtags"
129-
TARGET_PRE_LINK_ARGS = "${RPATH_LDFLAGS} ${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
130-
BUILD_PRE_LINK_ARGS = "${RPATH_LDFLAGS} ${BUILD_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
131-
HOST_PRE_LINK_ARGS = "${RPATH_LDFLAGS} ${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
126+
TARGET_PRE_LINK_ARGS = "${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
127+
BUILD_PRE_LINK_ARGS = "${BUILD_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
128+
HOST_PRE_LINK_ARGS = "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
132129

133130
# These LDFLAGS have '-L' options in them. We need these to come last so they
134131
# don't screw up the link order and pull in the wrong rust build/version.

0 commit comments

Comments
 (0)