mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-08 06:43:10 +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
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
diff --git a/sys/modules/aesni/Makefile b/sys/modules/aesni/Makefile
|
|
index cb8c744adde..1c327331890 100644
|
|
--- a/sys/modules/aesni/Makefile
|
|
+++ b/sys/modules/aesni/Makefile
|
|
@@ -1,7 +1,6 @@
|
|
# $FreeBSD$
|
|
|
|
.PATH: ${SRCTOP}/sys/crypto/aesni
|
|
-.PATH: ${SRCTOP}/contrib/llvm-project/clang/lib/Headers
|
|
|
|
KMOD= aesni
|
|
SRCS= aesni.c
|
|
@@ -40,8 +39,8 @@ intel_sha256.o: intel_sha256.c
|
|
aesni_ghash.o: aesni.h
|
|
aesni_wrap.o: aesni.h
|
|
aesni_ccm.o: aesni.h
|
|
-intel_sha1.o: sha_sse.h immintrin.h shaintrin.h tmmintrin.h xmmintrin.h
|
|
-intel_sha256.o: sha_sse.h immintrin.h shaintrin.h tmmintrin.h xmmintrin.h
|
|
+intel_sha1.o: sha_sse.h
|
|
+intel_sha256.o: sha_sse.h
|
|
|
|
.include <bsd.kmod.mk>
|
|
|
|
diff --git a/sys/modules/blake2/Makefile b/sys/modules/blake2/Makefile
|
|
index e4b3fb9f126..5bfd9c2ae02 100644
|
|
--- a/sys/modules/blake2/Makefile
|
|
+++ b/sys/modules/blake2/Makefile
|
|
@@ -3,7 +3,6 @@
|
|
.PATH: ${SRCTOP}/sys/contrib/libb2
|
|
.PATH: ${SRCTOP}/sys/crypto/blake2
|
|
.PATH: ${SRCTOP}/sys/opencrypto
|
|
-.PATH: ${SRCTOP}/contrib/llvm-project/clang/lib/Headers
|
|
|
|
KMOD = blake2
|
|
|
|
@@ -64,8 +63,7 @@ ${src:S/.c/.o/}: ${src}
|
|
-D_MM_MALLOC_H_INCLUDED -Wno-unused-function ${.IMPSRC}
|
|
${CTFCONVERT_CMD}
|
|
|
|
-${src:S/.c/.o/}: intrin.h emmintrin.h tmmintrin.h smmintrin.h immintrin.h \
|
|
- x86intrin.h ${SRCS:M*.h}
|
|
+${src:S/.c/.o/}: ${SRCS:M*.h}
|
|
.endfor
|
|
|
|
# FreeBSD-specific sources:
|