Skip to content

Commit 95316e5

Browse files
committed
[build][trunk] Make flang and clang cfg files match
This patch adds the `-L` lines in clang cfg files also to flang, making them the same. This is currently needed, in addition to llvm/llvm-project#134230, to get the `-mcode-object-version` option to work properly for flang.
1 parent ec59aea commit 95316e5

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

trunk/build_project.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,9 @@ if [ "$1" == "install" ] ; then
149149
EOD
150150
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/clang++.cfg
151151
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/clang.cfg
152-
# Do not add -L option to flang-new because it's not currently allowed
152+
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/flang.cfg
153153
# flang-new also appears to be reading flang.cfg
154-
cat <<EOD > ${TRUNK_INSTALL_DIR}/bin/flang.cfg
155-
-Wl,-rpath=<CFGDIR>/../lib
156-
-Wl,-rpath=<CFGDIR>/../lib/x86_64-unknown-linux-gnu
157-
EOD
158-
ln -sf flang.cfg ${TRUNK_INSTALL_DIR}/bin/flang-new.cfg
154+
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/flang-new.cfg
159155
(
160156
# workaround for issue with triple subdir and shared builds
161157
# problem with libomptarget.so finding dependent libLLVM* libs

trunk/build_project_exper.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,9 @@ if [ "$1" == "install" ] ; then
150150
EOD
151151
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/clang++.cfg
152152
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/clang.cfg
153-
# Do not add -L option to flang-new because it's not currently allowed
153+
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/flang.cfg
154154
# flang-new also appears to be reading flang.cfg
155-
cat <<EOD > ${TRUNK_INSTALL_DIR}/bin/flang.cfg
156-
-Wl,-rpath=<CFGDIR>/../lib
157-
-Wl,-rpath=<CFGDIR>/../lib/x86_64-unknown-linux-gnu
158-
EOD
159-
ln -sf flang.cfg ${TRUNK_INSTALL_DIR}/bin/flang-new.cfg
155+
ln -sf rpath.cfg ${TRUNK_INSTALL_DIR}/bin/flang-new.cfg
160156
(
161157
# workaround for issue with triple subdir and shared builds
162158
# problem with libomptarget.so finding dependent libLLVM* libs

0 commit comments

Comments
 (0)