Browse Source

Merge pull request #29217 from Calinou/fix-scons-platform-autodetection

Fix SCons automatic platform detection on Linux
Rémi Verschelde 6 years ago
parent
commit
eb70999ffa
1 changed files with 2 additions and 2 deletions
  1. 2 2
      SConstruct

+ 2 - 2
SConstruct

@@ -229,7 +229,7 @@ elif env_base['p'] != "":
 else:
 else:
     # Missing `platform` argument, try to detect platform automatically
     # Missing `platform` argument, try to detect platform automatically
     if sys.platform.startswith('linux'):
     if sys.platform.startswith('linux'):
-        selected_platform = 'linux'
+        selected_platform = 'x11'
     elif sys.platform == 'darwin':
     elif sys.platform == 'darwin':
         selected_platform = 'osx'
         selected_platform = 'osx'
     elif sys.platform == 'win32':
     elif sys.platform == 'win32':
@@ -239,7 +239,7 @@ else:
         for x in platform_list:
         for x in platform_list:
             print("\t" + x)
             print("\t" + x)
         print("\nPlease run SCons again and select a valid platform: platform=<string>")
         print("\nPlease run SCons again and select a valid platform: platform=<string>")
-    
+
     if selected_platform != "":
     if selected_platform != "":
         print("Automatically detected platform: " + selected_platform)
         print("Automatically detected platform: " + selected_platform)
         env_base["platform"] = selected_platform
         env_base["platform"] = selected_platform