@@ -192,34 +192,43 @@ config /etc/ldc2.conf (x86_64-pc-linux-gnu)
192192
193193 string getTargetFileName (in BuildSettings settings, in BuildPlatform platform)
194194 const {
195- assert (settings.targetName.length > 0 , " No target name set." );
195+ import std.conv : text;
196+
197+ string targetName ()
198+ {
199+ assert (settings.targetName.length > 0 , " No target name set." );
200+ return settings.targetName.idup;
201+ }
196202
197203 const p = platform.platform;
198204 final switch (settings.targetType) {
199- case TargetType.autodetect: assert (false , " Configurations must have a concrete target type." );
205+ case TargetType.autodetect:
206+ assert (false ,
207+ text(" Configurations must have a concrete target type, " , settings.targetName,
208+ " has " , settings.targetType));
200209 case TargetType.none: return null ;
201210 case TargetType.sourceLibrary: return null ;
202211 case TargetType.executable:
203212 if (p.canFind(" windows" ))
204- return settings. targetName ~ " .exe" ;
213+ return targetName ~ " .exe" ;
205214 else if (p.canFind(" wasm" ))
206- return settings. targetName ~ " .wasm" ;
207- else return settings. targetName.idup ;
215+ return targetName ~ " .wasm" ;
216+ else return targetName;
208217 case TargetType.library:
209218 case TargetType.staticLibrary:
210219 if (p.canFind(" windows" ) && ! p.canFind(" mingw" ))
211- return settings. targetName ~ " .lib" ;
212- else return " lib" ~ settings. targetName ~ " .a" ;
220+ return targetName ~ " .lib" ;
221+ else return " lib" ~ targetName ~ " .a" ;
213222 case TargetType.dynamicLibrary:
214223 if (p.canFind(" windows" ))
215- return settings. targetName ~ " .dll" ;
224+ return targetName ~ " .dll" ;
216225 else if (p.canFind(" darwin" ))
217- return " lib" ~ settings. targetName ~ " .dylib" ;
218- else return " lib" ~ settings. targetName ~ " .so" ;
226+ return " lib" ~ targetName ~ " .dylib" ;
227+ else return " lib" ~ targetName ~ " .so" ;
219228 case TargetType.object:
220229 if (p.canFind(" windows" ))
221- return settings. targetName ~ " .obj" ;
222- else return settings. targetName ~ " .o" ;
230+ return targetName ~ " .obj" ;
231+ else return targetName ~ " .o" ;
223232 }
224233 }
225234
0 commit comments