diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-11-24 19:24:21 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-11-24 19:24:21 +0100 |
commit | cad40adce5eda7a50e7d40dae4e88219ef3fe0cf (patch) | |
tree | 3ea518fd4b32ec365585405073102b26d69e0352 /src/libstore/build.cc | |
parent | 6c10bd7c5e946424996e3628e74ba433207aa90e (diff) | |
parent | 8a74a125bc3ac7a8273b8a1be8f0774a664900af (diff) |
Merge pull request #704 from ysangkok/freebsd-support
FreeBSD support with knowledge about Linux emulation
Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r-- | src/libstore/build.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 81ef701b0..9b6f40f54 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1276,6 +1276,8 @@ static bool canBuildLocally(const BasicDerivation & drv) || (drv.platform == "i686-linux" && settings.thisSystem == "x86_64-linux") || (drv.platform == "armv6l-linux" && settings.thisSystem == "armv7l-linux") #endif + || (platform == "i686-linux" && settings.thisSystem == "x86_64-freebsd") + || (platform == "i686-linux" && settings.thisSystem == "i686-freebsd") ; } |