From a0f073341320b4e66ebc8059a0d29ed9db8ea4ec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Nov 2015 14:41:19 +0100 Subject: [PATCH] Fix build failure introduced by #704 Also, make the FreeBSD checks conditional on FreeBSD. --- src/libstore/build.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 9b6f40f54..76579bfda 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1275,9 +1275,10 @@ static bool canBuildLocally(const BasicDerivation & drv) #if __linux__ || (drv.platform == "i686-linux" && settings.thisSystem == "x86_64-linux") || (drv.platform == "armv6l-linux" && settings.thisSystem == "armv7l-linux") +#elif __FreeBSD__ + || (drv.platform == "i686-linux" && settings.thisSystem == "x86_64-freebsd") + || (drv.platform == "i686-linux" && settings.thisSystem == "i686-freebsd") #endif - || (platform == "i686-linux" && settings.thisSystem == "x86_64-freebsd") - || (platform == "i686-linux" && settings.thisSystem == "i686-freebsd") ; }