Skip to content

[build][trunk] Make flang and clang cfg files match #1340

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

Merged
merged 1 commit into from
Apr 4, 2025
Merged

[build][trunk] Make flang and clang cfg files match #1340

Show file tree
Hide file tree
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
8 changes: 2 additions & 6 deletions trunk/build_project.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,9 @@ if [ "$1" == "install" ] ; then
EOD
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/clang++.cfg
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/clang.cfg
# Do not add -L option to flang-new because it's not currently allowed
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/flang.cfg
# flang-new also appears to be reading flang.cfg
cat <<EOD > ${TRUNK_INSTALL_DIR}/bin/flang.cfg
-Wl,-rpath=<CFGDIR>/../lib
-Wl,-rpath=<CFGDIR>/../lib/x86_64-unknown-linux-gnu
EOD
ln -sf flang.cfg ${TRUNK_INSTALL_DIR}/bin/flang-new.cfg
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/flang-new.cfg
(
# workaround for issue with triple subdir and shared builds
# problem with libomptarget.so finding dependent libLLVM* libs
Expand Down
8 changes: 2 additions & 6 deletions trunk/build_project_exper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,9 @@ if [ "$1" == "install" ] ; then
EOD
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/clang++.cfg
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/clang.cfg
# Do not add -L option to flang-new because it's not currently allowed
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/flang.cfg
# flang-new also appears to be reading flang.cfg
cat <<EOD > ${TRUNK_INSTALL_DIR}/bin/flang.cfg
-Wl,-rpath=<CFGDIR>/../lib
-Wl,-rpath=<CFGDIR>/../lib/x86_64-unknown-linux-gnu
EOD
ln -sf flang.cfg ${TRUNK_INSTALL_DIR}/bin/flang-new.cfg
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/flang-new.cfg
(
# workaround for issue with triple subdir and shared builds
# problem with libomptarget.so finding dependent libLLVM* libs
Expand Down