From 7cdb6a830526fb77fc1270c34145d512e3269812 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 27 Jun 2018 18:11:47 +0000 Subject: [PATCH] Don't hardcode the TOOLS_PREFIX for the startfiles directories. GCC 4.2 prefixes these directories with --sysroot meaning that during buildworld they have a double sysroot. Reviewed by: bdrewery Sponsored by: DARPA / AFRL Differential Revision: https://reviews.freebsd.org/D14780 --- gnu/usr.bin/cc/cc_tools/freebsd-native.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h index 01c7a49ee020..fce911f94649 100644 --- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h +++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h @@ -43,8 +43,8 @@ /usr/lib directory. */ #undef MD_STARTFILE_PREFIX /* We don't need one for now. */ -#define STANDARD_STARTFILE_PREFIX PREFIX"/lib/" -#define STARTFILE_PREFIX_SPEC PREFIX"/lib/" +#define STANDARD_STARTFILE_PREFIX "/usr/lib/" +#define STARTFILE_PREFIX_SPEC "/usr/lib/" #if 0 #define LIBGCC_SPEC "%{shared: -lgcc_pic} \