Always accept .o and .obj files

dlang · Dec 27, 2024 · ab6606c · ab6606c
1 parent b2c83e9
commit ab6606c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/compiler/src/dmd/mars.d b/compiler/src/dmd/mars.d
@@ -1836,7 +1836,7 @@ bool createModule(const(char)* file, ref Strings libmodules, const ref Target ta
 
     /* Deduce what to do with a file based on its extension
         */
-    if (FileName.equals(ext, target.obj_ext))
+    if (FileName.equals(ext, obj_extensions[0]) || FileName.equals(ext, obj_extensions[1]))
     {
         global.params.objfiles.push(file);
         libmodules.push(file);

diff --git a/compiler/src/dmd/target.d b/compiler/src/dmd/target.d
@@ -292,6 +292,8 @@ void addCppRuntimePredefinedGlobalIdent(const ref TargetCPP cpp)
     }
 }
 
+package immutable string[] obj_extensions = ["obj", "o"];
+
 ////////////////////////////////////////////////////////////////////////////////
 /**
  * Describes a back-end target. At present it is incomplete, but in the future
@@ -499,14 +501,14 @@ extern (C++) struct Target
 
         if (os == Target.OS.Windows)
         {
-            obj_ext = "obj";
+            obj_ext = obj_extensions[0];
             lib_ext = "lib";
             dll_ext = "dll";
             run_noext = false;
         }
         else if (os & (Target.OS.linux | Target.OS.FreeBSD | Target.OS.OpenBSD | Target.OS.DragonFlyBSD | Target.OS.Solaris | Target.OS.OSX))
         {
-            obj_ext = "o";
+            obj_ext = obj_extensions[1];
             lib_ext = "a";
             if (os == Target.OS.OSX)
                 dll_ext = "dylib";