diff options
| author | Mike Pall <mike> | 2013-09-03 16:02:54 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-09-03 16:02:54 +0200 |
| commit | f8cecffbbf0fdb7a038d48c136a4bba67c64881e (patch) | |
| tree | 642ff017e1d3c5c392c1177cf7288b1c74785799 /src/ljamalg.c | |
| parent | a4fa4dcfdf5649fb5df623f31648046113c70b61 (diff) | |
| parent | b6ec7c7c86ac249ac40a241e1c9b47b729bbba3b (diff) | |
| download | luajit-f8cecffbbf0fdb7a038d48c136a4bba67c64881e.tar.gz luajit-f8cecffbbf0fdb7a038d48c136a4bba67c64881e.tar.bz2 luajit-f8cecffbbf0fdb7a038d48c136a4bba67c64881e.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/ljamalg.c')
| -rw-r--r-- | src/ljamalg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ljamalg.c b/src/ljamalg.c index 29fed380..6a4d6022 100644 --- a/src/ljamalg.c +++ b/src/ljamalg.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | /* | 6 | /* |
| 7 | +--------------------------------------------------------------------------+ | 7 | +--------------------------------------------------------------------------+ |
| 8 | | WARNING: Compiling the amalgamation needs a lot of virtual memory | | 8 | | WARNING: Compiling the amalgamation needs a lot of virtual memory | |
| 9 | | (around 200 MB with GCC 4.x)! If you don't have enough physical memory | | 9 | | (around 300 MB with GCC 4.x)! If you don't have enough physical memory | |
| 10 | | your machine will start swapping to disk and the compile will not finish | | 10 | | your machine will start swapping to disk and the compile will not finish | |
| 11 | | within a reasonable amount of time. | | 11 | | within a reasonable amount of time. | |
| 12 | | So either compile on a bigger machine or use the non-amalgamated build. | | 12 | | So either compile on a bigger machine or use the non-amalgamated build. | |