From 68be8d7a1884fe678016b5ea20c16b3b124e8406 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Fri, 21 Sep 2018 22:13:25 -0500 Subject: [PATCH] SOLARIS: Fix platforms for KOBJ definition Currently, we define KOBJ to "MODLOAD32 MODLOAD64" for the following platforms: Which doesn't make any sense, since "all" includes sun4x_511 and sunx86_511. The previous commits that modified this line, e4c2810f (Remove support for Solaris pre-8) and c6a22d67 (SOLARIS: Do not build x86 kernel module on 5.11), clearly meant to change the platforms sun4x_511 and sunx86_511 to use the KOBJ on the next line, but omitted the leading "-" for the platform. This doesn't break anything, since the Makefile on these platforms expands to: KOBJ = MODLOAD32 MODLOAD64 KOBJ = MODLOAD64 So the first KOBJ line is effectively ignored. It's confusing, though, so fix this line so these platforms only get one KOBJ definition. Change-Id: Idea9fdee4ac5883428748c2a5fdfa9707406436a Reviewed-on: https://gerrit.openafs.org/13343 Tested-by: BuildBot Reviewed-by: Michael Meffie Reviewed-by: Benjamin Kaduk --- src/libafs/MakefileProto.SOLARIS.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in index f04ceef..31d8b3e 100644 --- a/src/libafs/MakefileProto.SOLARIS.in +++ b/src/libafs/MakefileProto.SOLARIS.in @@ -65,7 +65,7 @@ LDFLAGS=-r -dy -N drv/ip -N drv/udp -N strmod/rpcmod LDFLAGS=-r -dy -N drv/ip -N drv/udp -N strmod/rpcmod -N fs/ufs # Name of directory to hold object files and libraries. - + KOBJ = MODLOAD32 MODLOAD64 KOBJ = MODLOAD64 -- 1.9.4