Clean up placeholder work

d-musique · thewilsonator · commit 4e6bbbac469e · 2025-01-06T05:10:45.000+08:00
diff --git a/driver/configfile.d b/driver/configfile.d
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 module driver.configfile;
 
+import dmd.globals;
 import dmd.root.array;
 import driver.config;
 import core.stdc.stdio;
@@ -110,18 +111,12 @@ struct CfgPaths
     }
 }
 
-extern(C++, "ldc")
-{
-    extern __gshared const(const(char) *) ldc_version;
-}
-
 string replacePlaceholders(string str, CfgPaths cfgPaths)
 {
-    const dVersion = ldc_version[0..strlen(ldc_version)];
     return str
         .replace("%%ldcbinarypath%%", cfgPaths.ldcBinaryDir)
         .replace("%%ldcconfigpath%%", cfgPaths.cfgBaseDir)
-        .replace("%%ldcversion%%", cast(string) dVersion);
+        .replace("%%ldcversion%%", cast(string) global.ldc_version);
 }
 
 extern(C++) struct ConfigFile

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`//===----------------------------------------------------------------------===//`
`13`	`13`	`module driver.configfile;`
`14`	`14`
	`15`	`+import dmd.globals;`
`15`	`16`	`import dmd.root.array;`
`16`	`17`	`import driver.config;`
`17`	`18`	`import core.stdc.stdio;`
`@@ -110,18 +111,12 @@ struct CfgPaths`
`110`	`111`	`}`
`111`	`112`	`}`
`112`	`113`
`113`		`-extern(C++, "ldc")`
`114`		`-{`
`115`		`- extern __gshared const(const(char) *) ldc_version;`
`116`		`-}`
`117`		`-`
`118`	`114`	`string replacePlaceholders(string str, CfgPaths cfgPaths)`
`119`	`115`	`{`
`120`		`- const dVersion = ldc_version[0..strlen(ldc_version)];`
`121`	`116`	`return str`
`122`	`117`	`.replace("%%ldcbinarypath%%", cfgPaths.ldcBinaryDir)`
`123`	`118`	`.replace("%%ldcconfigpath%%", cfgPaths.cfgBaseDir)`
`124`		`- .replace("%%ldcversion%%", cast(string) dVersion);`
	`119`	`+ .replace("%%ldcversion%%", cast(string) global.ldc_version);`
`125`	`120`	`}`
`126`	`121`
`127`	`122`	`extern(C++) struct ConfigFile`