Skip to content

Commit a3affb2

Browse files
committed
Use rpath to LLVM Toolchain libs directory in LLVM Makeconf
(cherry picked from commit 19f024f)
1 parent 0697d55 commit a3affb2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

com.oracle.truffle.r.native/run/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ $(FASTR_BIN_DIR)/R: Makefile R.sh Rscript.sh Rscript_exec.sh Rclasspath.sh
109109
ed Makeconf.etc < edMakeconf.etc.llvm
110110
sed -i -e 's/-fopenmp//' Makeconf.etc
111111
sed -i -e 's~LIBR0 =~LIBR0 = -lR~' Makeconf.etc
112-
sed -i -e 's~LDFLAGS =~LDFLAGS = -Wl,-rpath,$$\(R_HOME\)/lib/ -L$$\(R_HOME\)/lib -lf2c~' Makeconf.etc
112+
sed -i -e 's~LDFLAGS =~LDFLAGS = -Wl,-rpath,$$\(R_HOME\)/lib/,-rpath,$$\(R_HOME\)/../llvm/native/lib -L$$\(R_HOME\)/lib -lf2c~' Makeconf.etc
113113
sed -i -e 's~^CXXFLAGS =\(.*\)~CXXFLAGS = \1 $(FASTR_CXXFLAGS)~g' Makeconf.etc
114114
# A workaround for a Sulong issue: TODO: the issue ID
115115
sed -i -e 's/-O2//' Makeconf.etc

0 commit comments

Comments
 (0)