diff options
| author | uwe <uwe@NetBSD.org> | 2023-04-23 09:54:15 +0000 |
|---|---|---|
| committer | uwe <uwe@NetBSD.org> | 2023-04-23 09:54:15 +0000 |
| commit | df09bc024352bb0000f34838222783bb5c03e611 (patch) | |
| tree | ac92b0535d0c0dfbbe61b393c2d7e91554cc65af | |
| parent | 1cbd1f2ce3f83953c754bd6f89576dbf71f406aa (diff) | |
build.sh: drop -lrumpdev hack introduced in previous
The existing trick in sys/rump/librump/rumpdev/rump_dev.c was not
updated after the renames in the kernel. kudos to riastradh.
PR kern/56599
| -rwxr-xr-x | build.sh | 16 |
1 files changed, 4 insertions, 12 deletions
@@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.367 2023/04/23 02:01:33 uwe Exp $ +# $NetBSD: build.sh,v 1.368 2023/04/23 09:54:15 uwe Exp $ # # Copyright (c) 2001-2022 The NetBSD Foundation, Inc. # All rights reserved. @@ -2010,7 +2010,7 @@ createmakewrapper() eval cat <<EOF ${makewrapout} #! ${HOST_SH} # Set proper variables to allow easy "make" building of a NetBSD subtree. -# Generated from: \$NetBSD: build.sh,v 1.367 2023/04/23 02:01:33 uwe Exp $ +# Generated from: \$NetBSD: build.sh,v 1.368 2023/04/23 09:54:15 uwe Exp $ # with these arguments: ${_args} # @@ -2260,28 +2260,20 @@ installworld() # there are still unwanted dependencies: # net -> net_net # vfs -> fifo -# dev -> vfs # -lrumpvfs -> $LRUMPVFS for now LRUMPVFS="-lrumpvfs -lrumpvfs_nofifofs" -# -lrumpdev -> $LRUMPDEV -# XXX: this may hide problems with other rump libraries that are not -# supposed to depend on vfs but accidentally do -LRUMPDEV="-lrumpdev $LRUMPVFS" - RUMP_LIBSETS=" -lrump, -lrumpvfs --no-whole-archive -lrumpvfs_nofifofs -lrump, - -lrumpdev - --no-whole-archive $LRUMPVFS -lrump, -lrumpkern_tty --no-whole-archive $LRUMPVFS -lrump, -lrumpfs_tmpfs --no-whole-archive $LRUMPVFS -lrump, -lrumpfs_ffs -lrumpfs_msdos - --no-whole-archive $LRUMPVFS -lrumpdev_disk $LRUMPDEV -lrump, + --no-whole-archive $LRUMPVFS -lrumpdev_disk -lrumpdev -lrump, -lrumpnet_virtif -lrumpnet_netinet -lrumpnet_net -lrumpnet --no-whole-archive -lrump, -lrumpfs_nfs @@ -2289,7 +2281,7 @@ RUMP_LIBSETS=" -lrumpnet_sockin -lrumpnet_virtif -lrumpnet_netinet --start-group -lrumpnet_net -lrumpnet --end-group -lrump, -lrumpdev_cgd -lrumpdev_raidframe -lrumpdev_rnd -lrumpdev_dm - --no-whole-archive $LRUMPVFS -lrumpdev_disk $LRUMPDEV -lrumpkern_crypto -lrump + --no-whole-archive $LRUMPVFS -lrumpdev_disk -lrumpdev -lrumpkern_crypto -lrump " dorump() |
