dcf7a5ec3d
See https://github.com/NixOS/nixpkgs/pull/82131 for the rest of the changes for FreeBSD. This is PRed separately because it is a macOS moderate rebuild so we target staging. The main change is that we CD to the path we're building *after* applying patches, so we can patch other parts of the tree (from `extraPaths`) as needed. Another change is that `netbsd.install` no longer depends on `fts`, which it evidently no longer needs.
23 lines
637 B
Diff
23 lines
637 B
Diff
commit f2d0ff85e05b49e9d11735ce4810b242c1dbf5af
|
|
Author: John Ericson <John.Ericson@Obsidian.Systems>
|
|
Date: Wed Sep 1 15:38:56 2021 +0000
|
|
|
|
Make should not hit configure
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index b5adb8a5f2e9..1a914ef16739 100644
|
|
--- a/tools/compat/Makefile
|
|
+++ b/tools/compat/Makefile
|
|
@@ -76,11 +76,6 @@ _CURDIR:= ${.CURDIR}
|
|
|
|
SRCS:= ${SRCS:M*.c}
|
|
|
|
-config.cache: include/.stamp configure nbtool_config.h.in defs.mk.in
|
|
- rm -f ${.TARGET}
|
|
- CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} LDFLAGS=${HOST_LDFLAGS:Q} \
|
|
- ${HOST_SH} ${.CURDIR}/configure --cache-file=config.cache
|
|
-
|
|
defs.mk: config.cache
|
|
@touch ${.TARGET}
|
|
|