mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-16 18:53:17 +00:00
0afe9d1f70
Always set `SRCTOP`, set it with abs path
llvmPackages: Bump minimum version for FreeBSD
llvmPackages_*, libgcc, compiler_rt: Hack in enough libs that one can compiler C
freebsd.compat: Rename some things to work around cc-wrapper change
0bea4a194f / #191724 in particular
43 lines
1.1 KiB
Diff
43 lines
1.1 KiB
Diff
diff --git a/tools/build/Makefile b/tools/build/Makefile
|
|
index 948a5f9dfdb..592af84eeae 100644
|
|
--- a/tools/build/Makefile
|
|
+++ b/tools/build/Makefile
|
|
@@ -327,15 +327,15 @@ host-symlinks:
|
|
# and cross-tools stages. We do this here using mkdir since mtree may not exist
|
|
# yet (this happens if we are crossbuilding from Linux/Mac).
|
|
INSTALLDIR_LIST= \
|
|
- bin \
|
|
- lib/casper \
|
|
- lib/geom \
|
|
- usr/include/casper \
|
|
- usr/include/private/ucl \
|
|
- usr/include/private/zstd \
|
|
- usr/lib \
|
|
- usr/libdata/pkgconfig \
|
|
- usr/libexec
|
|
+ ${BINDIR} \
|
|
+ ${LIBDIR}/casper \
|
|
+ ${LIBDIR}/geom \
|
|
+ ${INCLUDEDIR}/casper \
|
|
+ ${INCLUDEDIR}/private/ucl \
|
|
+ ${INCLUDEDIR}/private/zstd \
|
|
+ ${LIBDIR} \
|
|
+ ${LIBDIR}/libdata/pkgconfig \
|
|
+ ${LIBEXECDIR}
|
|
|
|
installdirs:
|
|
mkdir -p ${INSTALLDIR_LIST:S,^,${DESTDIR}/,}
|
|
@@ -352,9 +352,9 @@ installdirs:
|
|
rm -rf "${DESTDIR}/${_dir}"; \
|
|
fi
|
|
.endfor
|
|
- ln -sfn bin ${DESTDIR}/sbin
|
|
- ln -sfn ../bin ${DESTDIR}/usr/bin
|
|
- ln -sfn ../bin ${DESTDIR}/usr/sbin
|
|
+ ln -sfn bin ${DESTDIR}/${SBINDIR}
|
|
+ ln -sfn ../bin ${DESTDIR}/${BINDIR}
|
|
+ ln -sfn ../bin ${DESTDIR}/${SBINDIR}
|
|
.for _group in ${INCSGROUPS:NINCS}
|
|
mkdir -p "${DESTDIR}/${${_group}DIR}"
|
|
.endfor
|