- const Tool &linker = builder.get_toolchain().get_tool("LINK");
- const Tool::SearchPath &syspath = linker.get_system_path();
-
- list<FS::Path> combined_path(path.begin(), path.end());
- combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
+ SearchPath combined_path = path;
+ if(use_syspath)
+ {
+ Tool &linker = builder.get_toolchain().get_tool("LINK");
+ linker.prepare();
+ const SearchPath &syspath = linker.get_system_path();
+ combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
+ }