Skip to content

Commit 61ee30e

Browse files
committed
Fix normal export (no --source)
1 parent fa527cf commit 61ee30e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

tools/export/gccarm.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ class GccArm(Exporter):
133133
def generate(self):
134134
# "make" wants Unix paths
135135
self.resources.win_to_unix()
136-
self.resources.relative_to(self.prj_paths[0])
136+
if self.sources_relative:
137+
self.resources.relative_to(self.prj_paths[0])
137138

138139
to_be_compiled = []
139140
for r_type in ['s_sources', 'c_sources', 'cpp_sources']:
@@ -159,7 +160,7 @@ def generate(self):
159160
'libraries': libraries,
160161
'symbols': self.get_symbols(),
161162
'cpu_flags': self.toolchain.cpu,
162-
'vpath': [relpath(s, build_dir) for s in self.prj_paths] if self.sources_relative else ["../"]
163+
'vpath': [relpath(s, build_dir) for s in self.prj_paths] if self.sources_relative else [".."]
163164
}
164165

165166
for key in ['include_paths', 'library_paths', 'linker_script']:

0 commit comments

Comments
 (0)