Skip to content

Commit d9919da

Browse files
committed
mkoctfile: Support spaces in output path of linker step.
* src/mkoctfile.in.cc (main): Quote argument after "-o" in linker step. * etc/NEWS.10.md: Add note about change.
1 parent c7f8bd4 commit d9919da

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

etc/NEWS.10.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Summary of bugs fixed for version 10.2.0 (tbd):
3232
- `findobj`: Do not match empty tags with `[]` (bug #67048).
3333
- Check for undefined output when indexing function output (bug #67111).
3434
- `perms`: Fix buffer overflow and crash; minor code cleanup (bug #67115).
35+
- `mkoctfile`: Support spaces in output path of linker step.
3536

3637

3738
### GUI

src/mkoctfile.in.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,10 +1396,10 @@ main (int argc, char **sys_argv)
13961396

13971397
std::string cmd
13981398
= (vars["CXXLD"] + ' ' + vars["ALL_CXXFLAGS"] + ' '
1399-
+ pass_on_options + " -o " + octfile + ' ' + objfiles + ' '
1400-
+ libfiles + ' ' + ldflags + ' ' + vars["DL_LDFLAGS"] + ' '
1401-
+ vars["LDFLAGS"] + ' ' + octave_libs + ' '
1402-
+ vars["OCT_LINK_OPTS"]);
1399+
+ pass_on_options + " -o " + quote_path (octfile) + ' '
1400+
+ objfiles + ' ' + libfiles + ' ' + ldflags + ' '
1401+
+ vars["DL_LDFLAGS"] + ' ' + vars["LDFLAGS"] + ' '
1402+
+ octave_libs + ' ' + vars["OCT_LINK_OPTS"]);
14031403

14041404
if (! creating_mex_file)
14051405
cmd += ' ' + vars["OCT_LINK_DEPS"];

0 commit comments

Comments
 (0)