Jelajahi Sumber

Merge pull request #1575 from JimMarlowe/JM-MONO-DETECT

Modern and legacy Linux mono detection for #1544
JoshEngebretson 8 tahun lalu
induk
melakukan
a795802116
1 mengubah file dengan 4 tambahan dan 1 penghapusan
  1. 4 1
      Build/Scripts/BuildConfig.js

+ 4 - 1
Build/Scripts/BuildConfig.js

@@ -45,7 +45,10 @@ function processOptions(config) {
             if ( spawnSync)
                 config["with-atomicnet"] = spawnSync("which", ["xbuild"]).status == 1 ? false : true;
         } else if (os.platform() == "linux") {  // see if xbuild is available on linux
-            config["with-atomicnet"] = programFileExists('/usr/bin/xbuild') && programDirectoryExists('/usr/bin/mono/');
+            var hasXbuild = programFileExists('/usr/bin/xbuild');
+            var hasMonoFile = programFileExists('/usr/bin/mono');
+            var hasMonoDir = programDirectoryExists('/usr/bin/mono/');
+            config["with-atomicnet"] = hasXbuild && ( hasMonoFile || hasMonoDir );
         }
 	}