From 28a8b55f4e54a3c67f8fb7e7a8cb81269fa150bc Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 26 Mar 2018 01:04:58 +0100 Subject: [PATCH] move non-portable file warning to package --- hledger/hledger.cabal | 10 +++++----- hledger/package.yaml | 2 ++ stack.yaml | 4 ---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 7251e84b3..0070ffd20 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: f8f9cb9d2b75d91e5ec746b32d1b0bb664b7914e1e578ae8a63e3ca0b39bbdfd +-- hash: 55fabc3fc9d798a398158f5c654864f700cf79ce83c0ae8fc2af05f2b545a9dd name: hledger version: 1.5.99 @@ -77,7 +77,7 @@ flag threaded default: True library - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans + ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path cpp-options: -DVERSION="1.5.99" build-depends: Decimal @@ -160,7 +160,7 @@ executable hledger main-is: hledger-cli.hs hs-source-dirs: app - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans + ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path cpp-options: -DVERSION="1.5.99" build-depends: Decimal @@ -212,7 +212,7 @@ test-suite test main-is: test.hs hs-source-dirs: test - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans + ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path cpp-options: -DVERSION="1.5.99" build-depends: Decimal @@ -264,7 +264,7 @@ benchmark bench main-is: bench.hs hs-source-dirs: bench - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans + ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path build-depends: ansi-terminal >=0.6.2.3 , base >=4.8 && <4.12 diff --git a/hledger/package.yaml b/hledger/package.yaml index 34e261d52..a4fc9b4d6 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -74,6 +74,8 @@ ghc-options: - -fno-warn-missing-signatures - -fno-warn-type-defaults - -fno-warn-orphans +# avoid "non-portable path" warning on mac, https://github.com/commercialhaskell/stack/issues/3918 +- -optP-Wno-nonportable-include-path dependencies: - base >=4.8 && <4.12 diff --git a/stack.yaml b/stack.yaml index 9dc4e4219..3edcb76f9 100644 --- a/stack.yaml +++ b/stack.yaml @@ -9,10 +9,6 @@ packages: - hledger-web - hledger-api -# avoid "non-portable path" warning on mac, https://github.com/commercialhaskell/stack/issues/3918 -ghc-options: - hledger: -optP-Wno-nonportable-include-path - extra-deps: # hledger-lib - easytest-0.1.1