Skip to content

Commit f12d34b

Browse files
committed
Fixed path issue due to merge error
1 parent 16aaaf5 commit f12d34b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mbed/mbed.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,12 +1410,12 @@ def compile(toolchain=None, mcu=None, source=False, build=False, compile_library
14101410
env['PYTHONPATH'] = os.path.abspath(program.path)
14111411

14121412
if not source or len(source) == 0:
1413-
source = [os.path.relpath(root_path, orig_path)]
1413+
source = [os.path.relpath(program.path, orig_path)]
14141414

14151415
if compile_tests:
14161416
# Compile tests
14171417
if not build:
1418-
build = os.path.join(os.path.relpath(root_path, orig_path), '.build/tests', target, tchain)
1418+
build = os.path.join(os.path.relpath(program.path, orig_path), '.build/tests', target, tchain)
14191419

14201420
popen(['python', os.path.join(tools_dir, 'test.py')]
14211421
+ ['-t', tchain, '-m', target]

0 commit comments

Comments
 (0)