Windows: Bundle missing 64-bit rdmd/ddemangle/dustmite tools

dlang · Dec 21, 2023 · 62f3378 · 62f3378
1 parent 96ffabf
commit 62f3378
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/create_dmd_release/create_dmd_release.d b/create_dmd_release/create_dmd_release.d
@@ -86,7 +86,6 @@ version(Windows)
     immutable dll           = ".dll";
     immutable libPhobos32   = "phobos";
     immutable libPhobos64   = "phobos64";
-    immutable build64BitTools = false;
 
     immutable osDirName     = "windows";
     immutable make          = "mingw32-make";
@@ -101,7 +100,6 @@ else version(Posix)
     immutable obj           = ".o";
     immutable libPhobos32   = "libphobos2";
     immutable libPhobos64   = "libphobos2";
-    immutable build64BitTools    = true;
 
     version(FreeBSD)
         immutable osDirName = "freebsd";
@@ -402,7 +400,6 @@ void buildAll(Bits bits, string branch)
         }
     }
 
-    if(build64BitTools || is32)
     {
         // Build the tools using the host compiler
         auto tools_makecmd = makecmd.replace(dmdEnv, " DMD=" ~ hostDMD);
@@ -415,8 +412,6 @@ void buildAll(Bits bits, string branch)
         run(tools_makecmd~" rdmd ddemangle dustmite");
     }
 
-    bool buildDub = true; // build64BitTools || is32;
-    if(buildDub)
     {
         // build dub with stable (host) compiler, b/c it breaks
         // too easily with the latest compiler, e.g. for nightlies
@@ -561,10 +556,7 @@ void createRelease(string branch)
             sc_ini = sc_ini.replace(`%@P%\optlink.exe`, `%@P%\..\bin\optlink.exe`);
             std.file.write(releaseBin64Dir~"/sc.ini", sc_ini);
         }
-        else // Win doesn't include 64-bit tools
-        {
-            copyDir(cloneDir~"/tools/generated/"~osDirName~"/64", releaseBin64Dir, file => !file.endsWith(obj));
-        }
+        copyDir(cloneDir~"/tools/generated/"~osDirName~"/64", releaseBin64Dir, file => !file.endsWith(obj));
         copyFile(cloneDir~"/dub/bin/dub64"~exe, releaseBin64Dir~"/dub"~exe);
         if (codesign)
             signBinaries(releaseBin64Dir);