try removing semaphore-compat

shayne-fletcher · Jul 22, 2024 · 48d8821 · 48d8821
1 parent ed7ac0d
commit 48d8821
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/ghc-lib-da-ghc-8.4.3.yml b/.github/workflows/ghc-lib-da-ghc-8.4.3.yml
@@ -22,14 +22,14 @@ jobs:
           echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
           echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
           echo "/c/msys64/usr/bin" >> $GITHUB_PATH
-        if: matrix.os == 'windows'
+        if: matrix.os == 'windows-latest'
       - name: Run CI.hs (windows)
         shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
         run: |-
           pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
           cabal run exe:ghc-lib-build-tool -- --da
-        if: matrix.os == 'windows'
+        if: matrix.os == 'windows-latest'
       - name: Run CI.hs (unix)
         shell: bash
         run: cabal run exe:ghc-lib-build-tool -- --da
-        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
+        if: matrix.os == 'ubuntu-latest' || matrix.os ==  'macos-13'
diff --git a/.github/workflows/ghc-lib-ghc-9.0.2-ghc-8.10.7.yml b/.github/workflows/ghc-lib-ghc-9.0.2-ghc-8.10.7.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, macos, windows]
+        os: [ubuntu-latest, macos-13, windows-latest]
     steps:
       - uses: actions/checkout@v4
       - uses: haskell-actions/setup@v2
@@ -25,14 +25,14 @@ jobs:
           echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
           echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
           echo "/c/msys64/usr/bin" >> $GITHUB_PATH
-        if: matrix.os == 'windows'
+        if: matrix.os == 'windows-latest'
       - name: Run CI.hs (windows)
         shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
         run: |-
           pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
           cabal run exe:ghc-lib-build-tool --constraint=any."happy==1.19.12" --constraint="any.alex==3.2.7.3" -- --ghc-flavor ghc-9.0.2
-        if: matrix.os == 'windows'
+        if: matrix.os == 'windows-latest'
       - name: Run CI.hs (unix)
         shell: bash
         run: cabal run exe:ghc-lib-build-tool --constraint="any.happy==1.19.12" --constraint="any.alex==3.2.7.3" -- --ghc-flavor ghc-9.0.2
-        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
+        if: matrix.os == 'ubuntu-latest' || matrix.os ==  'macos-13'
diff --git a/.github/workflows/ghc-lib-ghc-9.4.8-ghc-9.0.2.yml b/.github/workflows/ghc-lib-ghc-9.4.8-ghc-9.0.2.yml
@@ -25,14 +25,14 @@ jobs:
           echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
           echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
           echo "/c/msys64/usr/bin" >> $GITHUB_PATH
-        if: matrix.os == 'windows'
+        if: matrix.os == 'windows-latest'
       - name: Run CI.hs (windows)
         shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
         run: |-
           pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
           cabal run exe:ghc-lib-build-tool -- --ghc-flavor ghc-9.4.8
-        if: matrix.os == 'windows'
+        if: matrix.os == 'windows-latest'
       - name: Run CI.hs (unix)
         shell: bash
         run: cabal run exe:ghc-lib-build-tool -- --ghc-flavor ghc-9.4.8
-        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
+        if: matrix.os == 'ubuntu-latest' || matrix.os ==  'macos-13'
diff --git a/ghc-lib-gen/src/Ghclibgen.hs b/ghc-lib-gen/src/Ghclibgen.hs
@@ -364,10 +364,7 @@ calcModuleDeps includeDirs _hsSrcDirs hsSrcIncludes ghcFlavor ghcPackagePath ghc
         [ "ghc", "-M"] ++
         [ "-dep-suffix ''", "-dep-makefile " ++ ghcMakeModeOutputFile ] ++
         [ optP | optP <- [ "-optP -DGHCI", "-optP -DSTAGE=2" ], series < GHC_8_10 ] ++ [ "-optP -DGHC_IN_GHCI" | series < GHC_9_2 ] ++
-        includeDirs ++
-        [ pkg  | pkg <- [ "-package base" ] ++ [ "-package semaphore-compat" | series >= GHC_9_8 ] ] ++
-        hsSrcIncludes ++
-        [ rootModulePath ]
+        includeDirs ++ hsSrcIncludes ++ [ rootModulePath ]
       cmd' = "bash -c \"" ++ ghcPackagePath ++ " " ++ cmd ++ "\""
     in cmd'
     where