diff options
| author | Mike Pall <mike> | 2016-03-22 22:22:51 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-03-22 22:22:51 +0100 |
| commit | 713e34054f6206cb9d453a0924ffd7a302166bdd (patch) | |
| tree | 7b80d8ff413435af689a8d8d37353ab4bd3dd65d /doc | |
| parent | cf3e01e1363659e4c2688d42598d0982e43acee9 (diff) | |
| parent | 7e05355a08255f508d334eded96095e0bde06e2e (diff) | |
| download | luajit-713e34054f6206cb9d453a0924ffd7a302166bdd.tar.gz luajit-713e34054f6206cb9d453a0924ffd7a302166bdd.tar.bz2 luajit-713e34054f6206cb9d453a0924ffd7a302166bdd.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/install.html | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/install.html b/doc/install.html index dba63fd8..9921258e 100644 --- a/doc/install.html +++ b/doc/install.html | |||
| @@ -346,9 +346,12 @@ target OS differ, or you'll get assembler or linker errors. E.g. if | |||
| 346 | you're compiling on a Windows or OSX host for embedded Linux or Android, | 346 | you're compiling on a Windows or OSX host for embedded Linux or Android, |
| 347 | you need to add <tt>TARGET_SYS=Linux</tt> to the examples below. For a | 347 | you need to add <tt>TARGET_SYS=Linux</tt> to the examples below. For a |
| 348 | minimal target OS, you may need to disable the built-in allocator in | 348 | minimal target OS, you may need to disable the built-in allocator in |
| 349 | <tt>src/Makefile</tt> and use <tt>TARGET_SYS=Other</tt>. The examples | 349 | <tt>src/Makefile</tt> and use <tt>TARGET_SYS=Other</tt>. Don't forget to |
| 350 | below only show some popular targets — please check the comments | 350 | specify the same <tt>TARGET_SYS</tt> for the install step, too. |
| 351 | in <tt>src/Makefile</tt> for more details. | 351 | </p> |
| 352 | <p> | ||
| 353 | The examples below only show some popular targets — please check | ||
| 354 | the comments in <tt>src/Makefile</tt> for more details. | ||
| 352 | </p> | 355 | </p> |
| 353 | <pre class="code"> | 356 | <pre class="code"> |
| 354 | # Cross-compile to a 32 bit binary on a multilib x64 OS | 357 | # Cross-compile to a 32 bit binary on a multilib x64 OS |