diff options
| author | Richard Eisenberg <rae@cs.brynmawr.edu> | 2018-03-26 12:45:59 -0400 |
|---|---|---|
| committer | Richard Eisenberg <rae@cs.brynmawr.edu> | 2018-03-26 17:23:48 -0400 |
| commit | 97e1f300e4f6aef06863d056dc7992fef6b21538 (patch) | |
| tree | 6174e2ce237aa77f1e9ace32b2e15c6939fe61db | |
| parent | 41c155876c9e8137ff9b9f9f9a12c4a78a44bc70 (diff) | |
| download | haskell-97e1f300e4f6aef06863d056dc7992fef6b21538.tar.gz | |
Fix compilation stopper on macOS with -Werror
Commit 94f02547083cf6df686ea0b95fed050184c533de
added some pragmas that allow GCC to compile GHC, but stop
macOS's clang. This adds another counter-pragma to halp
clang lumber along, too.
Fixes #14977.
| -rw-r--r-- | libraries/ghc-prim/cbits/atomic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libraries/ghc-prim/cbits/atomic.c b/libraries/ghc-prim/cbits/atomic.c index 80d4f39ed0..b238041feb 100644 --- a/libraries/ghc-prim/cbits/atomic.c +++ b/libraries/ghc-prim/cbits/atomic.c @@ -123,8 +123,10 @@ hs_atomic_and64(StgWord x, StgWord64 val) #endif // Otherwise this fails with -Werror +#if defined(__GNUC__) && !defined(__clang__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wsync-nand" +#endif extern StgWord hs_atomic_nand8(StgWord x, StgWord val); StgWord |