Skip to content

Fix clang post-installation test #6300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shahor02 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix clang post-installation test #6300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions clang.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,17 @@ rm "$INSTALLROOT"/lib/cmake/clang/*.bak
# we want to resolve the environment when we run, not when we build this, to avoid
# relocation issues in case GCC and clang are not built at the same time.
if [ ! "X$GCC_TOOLCHAIN_ROOT" = X ]; then
cat > "$INSTALLROOT/bin-safe/$(clang --print-target-triple)-clang++.cfg" << \EOF
--gcc-toolchain=$GCC_TOOLCHAIN_ROOT
target_triple="$("$INSTALLROOT/bin-safe/clang" --print-target-triple)"
gcc_toolchain_root="$(eval echo "$GCC_TOOLCHAIN_ROOT")"

cat > "$INSTALLROOT/bin-safe/${target_triple}-clang++.cfg" << EOF
--gcc-toolchain=$gcc_toolchain_root
EOF
cat > "$INSTALLROOT/bin-safe/$(clang --print-target-triple)-clang.cfg" << \EOF
--gcc-toolchain=$GCC_TOOLCHAIN_ROOT
cat > "$INSTALLROOT/bin-safe/${target_triple}-clang.cfg" << EOF
--gcc-toolchain=$gcc_toolchain_root
EOF
cat > "$INSTALLROOT/bin-safe/$(clang --print-target-triple)-clang-cpp.cfg" << \EOF
--gcc-toolchain=$GCC_TOOLCHAIN_ROOT
cat > "$INSTALLROOT/bin-safe/${target_triple}-clang-cpp.cfg" << EOF
--gcc-toolchain=$gcc_toolchain_root
EOF
fi

Expand Down