Skip to content

Commit 8c16bed

Browse files
kripkenkripken
authored
[docs] Remove page for manually building fastcomp (emscripten-core#12305)
Also fix some broken links with the old incoming branch name.
1 parent ec38ce9 commit 8c16bed

6 files changed

Lines changed: 9 additions & 148 deletions

File tree

‎site/source/docs/building_from_source/building_fastcomp_manually_from_source.rst‎

Lines changed: 0 additions & 130 deletions
This file was deleted.

‎site/source/docs/building_from_source/configuring_emscripten_settings.rst‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ The settings file is created the first time a user runs :ref:`emcc <emccdoc>` (o
2929

3030
Emscripten makes a "best guess" at the correct locations for tools and updates the file appropriately. Where possible it will look for "system" apps (like Python and Java).
3131

32-
The file will probably not include the link to :term:`Fastcomp` (``LLVM_ROOT``) as a manual source build can create this anywhere.
32+
In most cases it is necessary to edit the generated file and modify at least the
33+
``LLVM_ROOT`` and ``BINARYEN_ROOT`` settings to point to the correct location of
34+
your local LLVM and Binaryen installations respectively.
3335

3436
Locating the compiler configuration file (.emscripten)
3537
=======================================================
@@ -66,14 +68,14 @@ You can find out the other variable names from the default *.emscripten* file or
6668
Editing the compiler configuration file
6769
=======================================
6870

69-
The compiler configuration file can be edited with the text editor of your choice. As stated above, most default settings are likely to be correct. If you're building manually from source, you are most likely to have to update the variable ``LLVM_ROOT`` (for :term:`Fastcomp`).
71+
The compiler configuration file can be edited with the text editor of your choice. As stated above, most default settings are likely to be correct. If you're building manually from source, you are most likely to have to update the variable ``LLVM_ROOT``
7072

7173

72-
#. Edit the variable ``LLVM_ROOT`` to point to the directory where you :ref:`built Fastcomp <llvm-update-compiler-configuration-file>`. This path is likely to be something like **<LLVM root>/build/Release/bin** or **<LLVM root>/build/bin**, where ``<LLVM root>`` is the path to the directory where you cloned LLVM:
74+
#. Edit the variable ``LLVM_ROOT`` to point to the directory where you built the LLVM binaries, such as:
7375

7476
::
7577
76-
LLVM_ROOT = os.path.expanduser(os.getenv('LLVM', '/home/ubuntu/a-path/emscripten-fastcomp/build/bin'))
78+
LLVM_ROOT = os.path.expanduser(os.getenv('LLVM', '/home/ubuntu/a-path/llvm/build/bin'))
7779

7880
.. note:: Use forward slashes!
7981

‎site/source/docs/building_from_source/index.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ Then point LLVM_ROOT in ``.emscripten`` to ``<llvm_src>/build/bin`` (no need to
2929

3030
Please refer to the upstream docs for more detail.
3131

32-
For using the older fastcomp backend, see :ref:`the fastcomp docs <building-fastcomp-from-source>`.
33-
3432
Building Binaryen
3533
-----------------
3634

@@ -40,7 +38,6 @@ See the `Binaryen build instructions <https://github.com/WebAssembly/binaryen#bu
4038
:maxdepth: 1
4139

4240
toolchain_what_is_needed
43-
building_fastcomp_manually_from_source
4441
configuring_emscripten_settings
4542
verify_emscripten_environment
4643

‎site/source/docs/getting_started/FAQ.rst‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -512,14 +512,6 @@ Why do I get ``error: cannot compile this aggregate va_arg expression yet`` and
512512
This is a limitation of the asm.js target in :term:`Clang`. This code is not currently supported.
513513

514514

515-
Why does building from source fail during linking (at 100%)?
516-
============================================================
517-
518-
Building :ref:`Fastcomp from source <building-fastcomp-from-source>` (and hence the SDK) can fail at 100% progress. This is due to out of memory in the linking stage, and is reported as an error: ``collect2: error: ld terminated with signal 9 [Killed]``.
519-
520-
The solution is to ensure the system has sufficient memory. On Ubuntu 14.04.1 LTS 64bit, you should use at least 6Gb.
521-
522-
523515
How do I pass int64_t and uint64_t values from js into wasm functions?
524516
======================================================================
525517

‎site/source/docs/porting/connecting_cpp_and_javascript/Interacting-with-code.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ added to the table. Otherwise by default the table has a fixed size.
631631

632632
For example, if you add a function that takes an integer and does not return
633633
anything, you can do ``addFunction(your_function, 'vi');``. See
634-
`tests/interop/test_add_function_post.js <https://github.com/emscripten-core/emscripten/blob/incoming/tests/interop/test_add_function_post.js>`_ for an example.
634+
`tests/interop/test_add_function_post.js <https://github.com/emscripten-core/emscripten/blob/master/tests/interop/test_add_function_post.js>`_ for an example.
635635

636636

637637
.. _interacting-with-code-access-memory:

‎site/source/docs/site/about.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Check out the rest of this article for instructions on how to :ref:`build the si
3939
Building the site
4040
=================
4141

42-
The site sources are stored on `GitHub <https://github.com/emscripten-core/emscripten/tree/incoming/site>`_. Edits and additions should be submitted to this branch in the same way as any other change to the tool.
42+
The site sources are stored on `GitHub <https://github.com/emscripten-core/emscripten/tree/master/site>`_. Edits and additions should be submitted to this branch in the same way as any other change to the tool.
4343

4444
The site is published to the **emscripten-core/emscripten-site** *gh-pages* branch (GitHub pages).
4545

@@ -93,7 +93,7 @@ SDK builds are enabled by enabling the ``sdkbuild`` tag. This is done through th
9393
Build version
9494
-------------
9595

96-
The documentation version should match the Emscripten version for the current build. For a general site build this will be the latest tagged release as defined in `Emscripten version <https://github.com/emscripten-core/emscripten/blob/incoming/emscripten-version.txt>`_. For an SDK build it will be the Emscripten version for the SDK.
96+
The documentation version should match the Emscripten version for the current build. For a general site build this will be the latest tagged release as defined in `Emscripten version <https://github.com/emscripten-core/emscripten/blob/master/emscripten-version.txt>`_. For an SDK build it will be the Emscripten version for the SDK.
9797

9898
The version and release information is used in a few places in the documentation, for example :ref:`emscripten-authors`.
9999

0 commit comments

Comments
 (0)