M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

doc/manual/installing: minor fixes

This commit is contained in:
Sebastien Bourdeauducq 2014-09-29 09:43:12 +08:00
parent 626fa782c3
commit 4e2c956f9c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/manual/installing.rst
View File

@ -38,7 +38,7 @@ Installing the host-side software
The main dependency of ARTIQ is LLVM and its Python bindings (http://llvmpy.org). Currently, this installation is tedious because of the OpenRISC support not being merged upstream LLVM and because of incompatibilities between the versions of LLVM that support OpenRISC and the versions of LLVM that support the Python bindings. :: The main dependency of ARTIQ is LLVM and its Python bindings (http://llvmpy.org). Currently, this installation is tedious because of the OpenRISC support not being merged upstream LLVM and because of incompatibilities between the versions of LLVM that support OpenRISC and the versions of LLVM that support the Python bindings. ::
git clone checkout https://github.com/openrisc/llvm-or1k git clone https://github.com/openrisc/llvm-or1k
cd llvm-or1k cd llvm-or1k
git checkout b3a48efb2c05ed6cedc5395ae726c6a6573ef3ba git checkout b3a48efb2c05ed6cedc5395ae726c6a6573ef3ba
patch -p1 < /path_to/ARTIQ/patches/llvm/* patch -p1 < /path_to/ARTIQ/patches/llvm/*
@ -63,7 +63,7 @@ The main dependency of ARTIQ is LLVM and its Python bindings (http://llvmpy.org)
patch -p1 < /path_to/ARTIQ/patches/llvmpy/* patch -p1 < /path_to/ARTIQ/patches/llvmpy/*
LLVM_CONFIG_PATH=/usr/local/llvm-or1k/bin/llvm-config sudo -E python setup.py install LLVM_CONFIG_PATH=/usr/local/llvm-or1k/bin/llvm-config sudo -E python setup.py install
You may want to use ``checkinstall`` instead of ``make install`` (which registers the installation with your package manager) and ``pip3 install --user .`` instead of ``sudo -E python setup.py install``. You may want to use ``checkinstall`` instead of ``make install`` (to register the installation with your package manager) and ``pip3 install --user .`` instead of ``sudo -E python setup.py install``.
You can then install ARTIQ itself: :: You can then install ARTIQ itself: ::