[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
111/118: Don't use ADDR_LIMIT_3GB
|
From: |
Ludovic Courtès |
|
Subject: |
111/118: Don't use ADDR_LIMIT_3GB |
|
Date: |
Tue, 19 May 2015 14:46:04 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit b73de6e49b64d01974649a1e67a77113b768c2b1
Author: Eelco Dolstra <address@hidden>
Date: Fri Nov 14 14:16:20 2014 +0100
Don't use ADDR_LIMIT_3GB
This gives 32-bit builds on x86_64-linux more memory.
---
nix/libstore/build.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index 49a6ac9..8d3b216 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -2110,7 +2110,7 @@ void DerivationGoal::initChild()
if (drv.platform == "i686-linux" &&
(settings.thisSystem == "x86_64-linux" ||
(!strcmp(utsbuf.sysname, "Linux") && !strcmp(utsbuf.machine,
"x86_64")))) {
- if (personality(PER_LINUX32_3GB) == -1)
+ if (personality(PER_LINUX32) == -1)
throw SysError("cannot set i686-linux personality");
}
- 113/118: Clean up temp roots in a more C++ way, (continued)
- 113/118: Clean up temp roots in a more C++ way, Ludovic Courtès, 2015/05/19
- 105/118: Remove some duplicate code, Ludovic Courtès, 2015/05/19
- 108/118: Improve error message if the daemon worker fails to start, Ludovic Courtès, 2015/05/19
- 100/118: Settings: Add bool get(), Ludovic Courtès, 2015/05/19
- 106/118: Improved error message when encountering unsupported file types, Ludovic Courtès, 2015/05/19
- 114/118: nix-daemon: Call exit(), not _exit(), Ludovic Courtès, 2015/05/19
- 99/118: Add an 'optimiseStore' remote procedure call., Ludovic Courtès, 2015/05/19
- 107/118: Fix build on gcc < 4.7, Ludovic Courtès, 2015/05/19
- 98/118: Add disallowedReferences / disallowedRequisites, Ludovic Courtès, 2015/05/19
- 110/118: Make ~DerivationGoal more reliable, Ludovic Courtès, 2015/05/19
- 111/118: Don't use ADDR_LIMIT_3GB,
Ludovic Courtès <=
- 115/118: Disable vacuuming the DB after garbage collection, Ludovic Courtès, 2015/05/19
- 117/118: Build derivations in a more predictable order, Ludovic Courtès, 2015/05/19
- 109/118: nix-store --gc: Don't warn about missing manifests directory, Ludovic Courtès, 2015/05/19
- 118/118: Don't wait for PID -1, Ludovic Courtès, 2015/05/19
- 112/118: Fix message, Ludovic Courtès, 2015/05/19
- 116/118: Don't create unnecessary substitution goals for derivations, Ludovic Courtès, 2015/05/19