Merge pull request #6949 from phadej/pr-6301-android

Accept "linux-androideabi" as an alias for Android
haskell · Jul 9, 2020 · 9d28c0c · 9d28c0c
2 parents 32dad5c + 77c27c5
commit 9d28c0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Cabal/Distribution/System.hs b/Cabal/Distribution/System.hs
@@ -122,7 +122,8 @@ osAliases Permissive FreeBSD = ["kfreebsdgnu"]
 osAliases Compat     FreeBSD = ["kfreebsdgnu"]
 osAliases Permissive Solaris = ["solaris2"]
 osAliases Compat     Solaris = ["solaris2"]
-osAliases _          Android = ["linux-android"]
+osAliases Permissive Android = ["linux-android", "linux-androideabi", "linux-androideabihf"]
+osAliases Compat     Android = ["linux-android"]
 osAliases _          _       = []
 
 instance Pretty OS where

diff --git a/changelog.d/pr-6301 b/changelog.d/pr-6301
@@ -0,0 +1,2 @@
+synopsis: Accept "linux-androideabi" for determining buildOS
+prs: #6301
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		synopsis: Accept "linux-androideabi" for determining buildOS
		prs: #6301