WIP working aarch64 build

Author: supermario

Shakefile.hs

@@ -22,7 +22,8 @@ main = do
       shakeVersion = shakefilesHash
     } $ do
 
-    StdoutTrim gitDescribe <- liftIO $ cmd "git" [ "describe", "--abbrev=8", "--match", "[0-9]*", "--always" ]
+    -- StdoutTrim gitDescribe <- liftIO $ cmd "git" [ "describe", "--abbrev=8", "--match", "[0-9]*", "--always" ]\
+    let gitDescribe = "0.19.1-20-gd87b2f0d"
     StdoutTrim gitSha <- liftIO $ cmd "git" [ "describe", "--always", "--match", "NOT A TAG", "--dirty" ]
 
     let lamdera = "_build" </> "lamdera" <.> exe
@@ -77,12 +78,12 @@ main = do
             , "gitDescribe = " ++ show (gitDescribe :: String)
             ]
 
-    Shakefiles.Haskell.cabalProject "avh4-lib"
-        [ "avh4-lib/avh4-lib.cabal" ]
-        [ "avh4-lib/src//*.hs" ]
-        []
-        [ "avh4-lib/test//*.hs" ]
-        []
+    -- Shakefiles.Haskell.cabalProject "avh4-lib"
+    --     [ "avh4-lib/avh4-lib.cabal" ]
+    --     [ "avh4-lib/src//*.hs" ]
+    --     []
+    --     [ "avh4-lib/test//*.hs" ]
+    --     []
 
     -- Shakefiles.Haskell.cabalProject "elm-format-markdown"
     --     [ "elm-format-markdown/elm-format-markdown.cabal" ]

Shakefiles/Dependencies.hs

@@ -9,6 +9,9 @@ import Development.Shake.Util
 localBinDir :: String
 localBinDir = "bin"
 
+--ghc-option required because of https://gitlab.haskell.org/ghc/ghc/-/issues/20592
+ghcOptionFFI = "--ghc-option=-I/Library/Developer/CommandLineTools/SDKs/MacOSX11.sdk/usr/include/ffi"
+
 
 cabalInstallExe :: String -> Action ()
 cabalInstallExe package =
@@ -19,6 +22,7 @@ cabalInstallExe package =
         -- these are currently needed because Windows doesn't support the default symlink method
         , "--install-method=copy"
         , "--overwrite-policy=always"
+        , ghcOptionFFI
         ]
 
 
@@ -41,7 +45,7 @@ rules = do
             , "cabal.project"
             , "cabal.project.freeze"
             ]
-        cmd_ "cabal" [ "v2-build", "--only-dependencies" ]
+        cmd_ "cabal" [ "v2-build", "--only-dependencies", ghcOptionFFI ]
         writeFile' out ""
 
     "_build/cabal-test-dependencies.ok" %> \out -> do
@@ -50,7 +54,7 @@ rules = do
             , "cabal.project"
             , "cabal.project.freeze"
             ]
-        cmd_ "cabal" [ "v2-build", "--only-dependencies", "--enable-tests" ]
+        cmd_ "cabal" [ "v2-build", "--only-dependencies", "--enable-tests", ghcOptionFFI ]
         writeFile' out ""
 
     shellcheck %> \out -> do

Shakefiles/Haskell.hs

@@ -11,6 +11,9 @@ import Data.Char (isSpace)
 import Data.List (dropWhileEnd, stripPrefix)
 import Shakefiles.Extra
 
+-- --ghc-option required because of https://gitlab.haskell.org/ghc/ghc/-/issues/20592
+ghcOptionFFI = "--ghc-option=-I/Library/Developer/CommandLineTools/SDKs/MacOSX11.sdk/usr/include/ffi"
+
 
 cabalProject :: String -> [String] -> [String] -> [String] -> [String] -> [String] -> Rules ()
 cabalProject name sourceFiles sourcePatterns deps testPatterns testDeps =
@@ -35,16 +38,16 @@ cabalProject name sourceFiles sourcePatterns deps testPatterns testDeps =
     do
         "_build/cabal/" </> name </> "build.ok" %> \out -> do
             hash <- needProjectFiles
-            cmd_ "cabal" "v2-build" "-O0"  (name ++ ":libs") "--enable-tests"
+            cmd_ "cabal" "v2-build" ghcOptionFFI "-O0"  (cabalName name ++ ":libs") "--enable-tests"
             writeFile' out hash
 
         cabalBinPath name "noopt" %> \out -> do
             _ <- needProjectFiles
-            cmd_ "cabal" "v2-build" "-O0" (name ++ ":exes") "--enable-tests"
+            cmd_ "cabal" "v2-build" ghcOptionFFI "-O0" (cabalName name ++ ":exes") "--enable-tests"
 
         cabalBinPath name "opt" %> \out -> do
             _ <- needProjectFiles
-            cmd_ "cabal" "v2-build" "-O2" (name ++ ":exes")
+            cmd_ "cabal" "v2-build" ghcOptionFFI "-O2" (cabalName name ++ ":exes")
 
         "_build/cabal/" </> name </> "test.ok" %> \out -> do
             need globalConfig
@@ -55,7 +58,7 @@ cabalProject name sourceFiles sourcePatterns deps testPatterns testDeps =
             need sourceFilesFromPatterns
             testFiles <- getDirectoryFiles "" testPatterns
             need testFiles
-            cmd_ "cabal" "v2-test" "-O0" (name ++ ":tests") "--test-show-details=streaming"
+            cmd_ "cabal" "v2-test" "-O0" (cabalName name ++ ":tests") "--test-show-details=streaming" ghcOptionFFI
             writeFile' out ""
 
 
@@ -64,11 +67,21 @@ cabalBinPath projectName opt =
     let
         version =
             case projectName of
-                "elm" -> "0.8.5"
+                "elm-format" -> "0.8.5"
+                "lamdera" -> "0.19.1"
+                "elm" -> "0.19.1"
                 _ -> "0.0.0"
     in
-    "dist-newstyle/build" </> Shakefiles.Platform.cabalInstallOs </> "ghc-9.0.2" </> projectName ++ "-" ++ version </> "x" </> projectName </> opt </> "build" </> projectName </> projectName <.> exe
+    -- dist-newstyle/build/aarch64-osx/ghc-9.0.2/elm-0.19.1/x/lamdera/opt/build/lamdera/lamdera
+    "dist-newstyle/build" </> Shakefiles.Platform.cabalInstallOs </> "ghc-9.0.2" </> cabalName projectName ++ "-" ++ version </> "x" </> projectName </> opt </> "build" </> projectName </> projectName <.> exe
+
 
+cabalName :: String -> String
+cabalName projectName =
+    case projectName of
+        "lamdera" -> "elm"
+        "elm" -> "elm"
+        _ -> projectName
 
 executable :: FilePath -> String -> String -> Rules ()
 executable target projectName gitDescribe =

Shakefiles/Platform.hs

@@ -24,6 +24,7 @@ platform =
     case (System.Info.os, System.Info.arch) of
         ("linux", "x86_64") -> Linux
         ("darwin", "x86_64") -> Mac
+        ("darwin", "aarch64") -> Mac
         ("osx", "x86_64") -> Mac
         ("mingw32", "x86_64") -> Windows
         ("win32", "x86_64") -> Windows

build.sh

@@ -7,7 +7,8 @@ mkdir -p _build
 # install shake if it's not installed
 if ! grep -qs '^package-id \(shake\|shk\)-' "$PKG_ENV_FILE"; then
   echo "$0: installing shake"
-  cabal v2-install --package-env "$PKG_ENV_FILE" --lib shake
+  # --ghc-option required because of https://gitlab.haskell.org/ghc/ghc/-/issues/20592
+  cabal v2-install --package-env "$PKG_ENV_FILE" --ghc-option="`pkg-config --cflags libffi`" --lib shake
 fi
 
 # compile the build script