Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion arm-software/linux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ COMPILER_CMAKE_FLAGS=(
-DCMAKE_SKIP_RPATH=No
-DCMAKE_SKIP_INSTALL_RPATH=No
-DLLVM_BUILD_DOCS=ON
-DFLANG_INCLUDE_DOCS=OFF
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we switching this off? This is also not mentioned in the summary.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We were switching it OFF as it used to fail before a recent upstream change has merged. Now in this commit I'm removing the line that switched generating the flang pages off.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a reference to the relevant upstream PR in this PR commit message.

-DLLVM_ENABLE_SPHINX=ON
-DSPHINX_WARNINGS_AS_ERRORS=OFF
-DLLVM_ENABLE_PROJECTS="llvm;clang;flang;lld"
Expand Down Expand Up @@ -414,6 +413,11 @@ package() {
sed -i "s/Bclang/Barmclang/g" "${ATFL_DIR}/share/man/man1/armclang.1"
sed -i "s/CLANG/ARMCLANG/g" "${ATFL_DIR}/share/man/man1/armclang.1"
sed -i "s/\"Clang\"/\"Armclang\"/g" "${ATFL_DIR}/share/man/man1/armclang.1"
cp "${ATFL_DIR}/share/man/man1/flang.1" "${ATFL_DIR}/share/man/man1/armflang.1"
sed -i "s/^flang\ /armflang\ /g" "${ATFL_DIR}/share/man/man1/armflang.1"
sed -i "s/\ flang\ /\ armflang\ /g" "${ATFL_DIR}/share/man/man1/armflang.1"
sed -i "s/FLANG/ARMFLANG/g" "${ATFL_DIR}/share/man/man1/armflang.1"
sed -i "s/\"Flang\"/\"Armflang\"/g" "${ATFL_DIR}/share/man/man1/armflang.1"
echo 'export PATH="$(dirname `realpath $BASH_SOURCE`)/bin:$PATH"' >"${ATFL_DIR}/env.bash"
echo 'export MANPATH="$(dirname `realpath $BASH_SOURCE`)/share/man:$MANPATH"' >>"${ATFL_DIR}/env.bash"
echo "export PS1=\"(ATfL ${ATFL_VERSION}) \$PS1\"" >>"${ATFL_DIR}/env.bash"
Expand Down