diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-11-25 14:41:19 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-11-25 14:41:19 +0100 |
| commit | a0f073341320b4e66ebc8059a0d29ed9db8ea4ec (patch) | |
| tree | 9cfda9c34ece6f2b6d40b64dd9fb8c7c369b9a59 | |
| parent | afef347157e618acb1f6e10b3d92ab897991cf2a (diff) | |
Fix build failure introduced by #704
Also, make the FreeBSD checks conditional on FreeBSD.
| -rw-r--r-- | src/libstore/build.cc | 5 |
1 files 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") ; } |