diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-11-07 09:17:59 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-11-07 09:18:10 -0500 |
| commit | 82a5c2410a47b16df09039b9786c2c0e34ba130e (patch) | |
| tree | 7bec6957ca68bb2c2a867bb1fc36bb3b9951e5a6 /.circleci | |
| parent | 39cd12b8d73b9d931ce1acaa7d9e74271c51086f (diff) | |
| download | haskell-82a5c2410a47b16df09039b9786c2c0e34ba130e.tar.gz | |
Revert "CircleCI: Build DWARF-enabled Linux bindists"
This reverts commit 406978c478e4b14e677f396499420d7b8e5d21fd.
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 23 | ||||
| -rwxr-xr-x | .circleci/prepare-system.sh | 7 |
2 files changed, 0 insertions, 30 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 6fd9b84075..f35690124b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -114,27 +114,6 @@ jobs: - *test - *store_test_results - "validate-x86_64-linux-dwarf": - resource_class: xlarge - docker: - - image: ghcci/x86_64-linux:0.0.4 - environment: - <<: *buildenv - GHC_COLLECTOR_FLAVOR: x86_64-linux-dwarf - ENABLE_DWARF: 1 - CONFIGURE_OPTS: --enable-dwarf-unwind - steps: - - checkout - - *prepare - - *submodules - - *boot - - *configure_unix - - *make - - *bindist - - *storeartifacts - - *test - - *store_test_results - "validate-x86_64-freebsd": resource_class: xlarge docker: @@ -313,8 +292,6 @@ workflows: jobs: - validate-x86_64-linux: *trigger_on_tags - - validate-x86_64-linux-dwarf: - *trigger_on_tags # FreeBSD disabled: https://github.com/haskell/unix/issues/102 # - validate-x86_64-freebsd - validate-x86_64-darwin: diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh index 39d32f13bc..dbb1011df5 100755 --- a/.circleci/prepare-system.sh +++ b/.circleci/prepare-system.sh @@ -22,10 +22,6 @@ BUILD_SPHINX_PDF=$BUILD_SPHINX_PDF BeConservative=YES EOF -if [[ -z ${ENABLE_DWARF:-} ]]; then - echo "GhcLibHcOpts=-g3" >> mk/build.mk -fi - case "$(uname)" in Linux) if [[ -n ${TARGET:-} ]]; then @@ -51,9 +47,6 @@ case "$(uname)" in cabal update cabal install --reinstall hscolour sudo ln -s /home/ghc/.cabal/bin/HsColour /usr/local/bin/HsColour || true - if [[ -z ${ENABLE_DWARF:-} ]]; then - apt-get install -qy libdw1-dev - fi fi ;; |