Skip to content

Commit d788cb2

Browse files
committed
Use fort bin dir insead of obj root
1 parent 8617ecd commit d788cb2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

test/lit.cfg

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ config.test_source_root = os.path.dirname(__file__)
2727
fort_obj_root = getattr(config, 'fort_obj_root', None)
2828
if fort_obj_root is not None:
2929
config.test_exec_root = os.path.join(fort_obj_root, 'test')
30+
config.fort_bin_dir = fort_bin_dir = os.path.join(fort_obj_root, 'bin')
3031

3132
# Set llvm_{src,obj}_root for use by others.
3233
config.llvm_src_root = getattr(config, 'llvm_src_root', None)
@@ -39,7 +40,7 @@ if fort_obj_root is not None:
3940
lit.fatal('No LLVM tools dir set!')
4041
# Set PATH - prepend fort bin dir and LLVM tools dir
4142
# Fort bin dir needs to come first in case it is an out of tree build
42-
path = os.path.pathsep.join((fort_obj_root, llvm_tools_dir, config.environment['PATH']))
43+
path = os.path.pathsep.join((fort_bin_dir, llvm_tools_dir, config.environment['PATH']))
4344
config.environment['PATH'] = path
4445

4546
llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)

0 commit comments

Comments
 (0)