Skip to content
This repository has been archived by the owner on Jul 31, 2020. It is now read-only.

Commit

Permalink
Back to -O0 for ghc- and cc- options.
Browse files Browse the repository at this point in the history
--disable-optimization is not a ghc option, but a cabal option.

Removed --disable-library-for-ghci -- it is not needed with -O0.

Also added source-repository.
  • Loading branch information
jgm committed Nov 27, 2011
1 parent 308780c commit 5f4e4c4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 16 deletions.
5 changes: 0 additions & 5 deletions changelog
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
highlighting-kate 0.3 (26 Nov 2011)

* Make `--disable-library-for-ghci` the default for OSX.
This prevents a linking error with some versions of GHC 7:
"scattered reloc r_address too large for inferred architecture i386."
Perhaps later this default can be changed.

* Use -O0 by default to speed compiling. This vastly improves compilation
speed and reduces memory requirements. In some rough tests, it does not
seem to hurt performance much, but those who need maximum performance
Expand Down
23 changes: 12 additions & 11 deletions highlighting-kate.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: highlighting-kate
Version: 0.3
Cabal-Version: >= 1.2
Cabal-Version: >= 1.6
Build-Type: Simple
Category: Text
Synopsis: Syntax highlighting
Expand Down Expand Up @@ -134,6 +134,10 @@ Flag pcre-light
Description: Use the pcre-light library instead of regex-pcre-builtin
Default: False

Source-repository head
type: git
location: git://github.com/jgm/highlighting-kate.git

Library
if flag(splitBase)
Build-Depends: base >= 3 && < 5, containers
Expand Down Expand Up @@ -244,24 +248,21 @@ Library
Text.Highlighting.Kate.Syntax.Yaml
Other-Modules: Text.Highlighting.Kate.Common
Paths_highlighting_kate
-- this works around a problem with ghc 7.03 on mac osx
-- we should be able to remove it later
if os(macosx)
Ghc-Options: -W --disable-optimization --disable-library-for-ghci
else
Ghc-Options: -W --disable-optimization
Ghc-Prof-Options: -auto-all -caf-all --disable-optimization
-- disable optimizations; it doesn't hurt performance much and
-- massively improves compilation speed and memory usage
Ghc-Options: -W -O0
Ghc-Prof-Options: -auto-all -caf-all
-- the following line is needed to prevent gcc from consuming huge amounts of
-- memory on platforms without a native code generator:
Cc-Options: -O0
Cc-Options: -O0

Executable Highlight
Main-Is: Highlight.hs
Build-Depends: base, containers, xhtml, filepath
if flag(pcre-light)
cpp-options: -D_PCRE_LIGHT
Ghc-Options: -W --disable-optimization
Ghc-Prof-Options: -auto-all -caf-all --disable-optimization
Ghc-Options: -W -O0
Ghc-Prof-Options: -auto-all -caf-all
-- the following line is needed to prevent gcc from consuming huge amounts of
-- memory on platforms without a native code generator:
Cc-Options: -O0
Expand Down

0 comments on commit 5f4e4c4

Please sign in to comment.