summaryrefslogtreecommitdiff
path: root/mk
Commit message (Collapse)AuthorAgeFilesLines
* Add "Unregisterised" as a field in the settings fileIan Lynagh2012-08-072-38/+4
| | | | | | To explicitly choose whether you want an unregisterised build you now need to use the "--enable-unregisterised"/"--disable-unregisterised" configure flags.
* Remove LD_X; it's no longer usedIan Lynagh2012-08-051-5/+0
|
* Re-enable inline-rule-shadowing warning.Paolo Capriotti2012-07-261-3/+4
| | | | Keep the warning off for template-haskell and bytestring for the moment.
* Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghcIan Lynagh2012-07-251-0/+2
|\
| * Add flag to disable rule shadowing warning.Paolo Capriotti2012-07-241-0/+2
| | | | | | | | | | Also, temporarely disable that warning for validate builds, until we finish fixing them all.
* | Remove some old temporary warning suppression for hoopl warningsIan Lynagh2012-07-241-9/+0
|/
* On Windows, detect if DLLs have too many symbols; trac #5987Ian Lynagh2012-06-291-0/+1
| | | | | The test isn't very pretty; it involves trawling through the objdump -p output. I couldn't find an easier way, unfortuantely.
* Switch to using the 'rubenvb' mingw buildsIan Lynagh2012-06-171-3/+3
|
* Rename package-conf flags to package-db.Paolo Capriotti2012-05-151-0/+2
| | | | | | | | Rename package database flags in both GHC and ghc-pkg so that they are consistent with Cabal nomenclature. Add a version check to the build system so that the correct set of package db flags are used when the bootstrapping GHC has version < 7.5.
* Follow upstream mtl and Cabal, add transformers package (#5958)Paolo Capriotti2012-05-071-0/+6
|
* Fix the way we call strip on DLLsIan Lynagh2012-05-061-0/+4
| | | | | | On Win64, "install -s" calls a strip that doesn't understand 64bit binaries. For some reason, this means the DLLs end up non-executable, which means executables that use them just segfault.
* Enable and fix building dynlibs on Win64Ian Lynagh2012-05-051-1/+5
|
* Add SRC_[CH]C_WARNING_OPTSIan Lynagh2012-04-261-5/+7
| | | | | | | | | | | This allows you to say things like SRC_HC_WARNING_OPTS += -fno-warn-unsupported-calling-conventions in mk/validate.mk. Unfortunately, we can't just use SRC_HC_OPTS, as that gets put before the more specific options (e.g. ghc-options in a .cabal file), many of which include -Wall. So now we have: ghc $(SRC_HC_OPTS) ... options from .cabal etc ... $(SRC_HC_WARNING_OPTS)
* Add linker support for ELF on ARMBen Gamari2012-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | Add support for ELF objects on ARM to the runtime linker. While the list of relocation types in the "ELF for the ARM Architecture" specification spans four pages, we thankfully only see a handful of these in the wild. Thus, at the moment we only support the following .rel relocation types, * R_ARM_ABS32 * R_ARM_TARGET1 * R_ARM_REL32 * R_ARM_CALL * R_ARM_JUMP24 * R_ARM_MOVT_ABS * R_ARM_MOVW_ABS_NC * R_ARM_THM_CALL * R_ARM_THM_JUMP24 * R_ARM_THM_MOVT_ABS * R_ARM_THM_MOVW_ABS_NC * R_ARM_THM_JUMP8 * R_ARM_THM_JUMP11 Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
* Merge remote-tracking branch 'origin/master' into type-natsIavor S. Diatchki2012-03-191-0/+6
|\
| * Fix path to windres on Win64Ian Lynagh2012-03-161-0/+6
| |
* | Merge remote-tracking branch 'origin/master' into type-natsIavor S. Diatchki2012-03-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: compiler/coreSyn/CoreLint.lhs compiler/deSugar/DsBinds.lhs compiler/hsSyn/HsTypes.lhs compiler/iface/IfaceType.lhs compiler/rename/RnHsSyn.lhs compiler/rename/RnTypes.lhs compiler/stgSyn/StgLint.lhs compiler/typecheck/TcHsType.lhs compiler/utils/ListSetOps.lhs
| * Add a hack to make validating with HADDOCK_DOCS=NO workIan Lynagh2012-02-211-1/+1
| | | | | | | | | | | | I've also renamed the bindisttest install directory to contain multiple spaces, so we are also testing that multiple spaces aren't getting collapsed into a single space.
* | Merge remote-tracking branch 'origin/master' into type-natsIavor S. Diatchki2012-02-123-16/+37
|\ \ | |/ | | | | | | Conflicts: compiler/coreSyn/CoreLint.lhs
| * Improve support for cross-compilationSimon Marlow2012-01-301-12/+37
| | | | | | | | Patchset from Stephen Blackheath <stephen.blackheath@ipwnstudios.com>
| * Remove bogus extra definition of $(dir)Simon Marlow2012-01-301-1/+0
| | | | | | | | | | This was preventing things like 'cd compiler; make stage2/build/DynFlags.o' from working.
| * Remove old dead safe haskell settingDavid Terei2012-01-251-3/+0
| |
* | Merge remote-tracking branch 'origin/master' into type-natsIavor S. Diatchki2012-01-242-1/+29
|\ \ | |/ | | | | | | Conflicts: compiler/typecheck/TcEvidence.lhs
| * Fix validateIan Lynagh2012-01-191-0/+3
| | | | | | | | | | | | | | | | This patch defines a flag -fno-warn-pointless-pragmas, and uses it to disable some warnings in the containers package. Along the way, also made a ContainsDynFlags class, and added a HasDynFlags instance for IOEnv (and thus TcRnIf and DsM).
| * Add some llvm build options to build.mk.sampleDavid Terei2012-01-131-1/+26
| |
* | Merge in more HEAD, fix stuff upSimon Peyton Jones2012-01-232-1/+4
|\ \ | |/
| * Enable llvm tool paths to be set with ./configureDavid Terei2012-01-101-0/+3
| | | | | | | | Patch from Karel Gardas!
| * RefactoringIan Lynagh2012-01-081-1/+1
| | | | | | | | | | This is working towards being able to put ghcautoconf.h and ghcplatform.h in includes/dist
* | Merge remote-tracking branch 'origin/master' into type-natsIavor S. Diatchki2012-01-071-6/+5
|\ \ | |/
| * Enable the threaded RTS when unregisterised too.Simon Marlow2012-01-061-6/+5
| | | | | | | | | | | | | | | | | | It was disabled by me in 1a470c9404950cc6737853309d35798a98ad0c30 (May 2007), but the commit gave no explanation as to why. Perhaps this was before we had a separate knob for GhcWithSMP. Anyway, it looks like threaded works fine with unregisterised, so I'm enabling it again.
* | Remove tabs, so that I can push.Iavor S. Diatchki2011-12-181-1/+1
|/
* HEAD now requires GHC >= 7.0 to bootstrapIan Lynagh2011-12-131-3/+0
|
* Use touchy rather than touch when building on WindowsIan Lynagh2011-12-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Windows 7 in a vitrual box VM on OS X, some very odd things happen with dates and time stamps when SSHing into cygwin. e.g. here the "Change" time is in the past: $ date; touch foo; stat foo Fri Dec 2 16:58:07 GMTST 2011 File: `foo' Size: 0 Blocks: 0 IO Block: 65536 regular empty file Device: 540aba0bh/1409989131d Inode: 562949953592977 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ ian) Gid: ( 513/ None) Access: 2011-12-02 16:58:07.414457900 +0000 Modify: 2011-12-02 16:58:07.414457900 +0000 Change: 2011-12-02 16:58:03.495141800 +0000 Birth: 2011-12-02 16:57:57.731469900 +0000 And if we copy such a file, then the copy is older (as determined by the "Modify" time) than the original: $ date; touch foo; stat foo; cp foo bar; stat bar Fri Dec 2 16:59:10 GMTST 2011 File: `foo' Size: 0 Blocks: 0 IO Block: 65536 regular empty file Device: 540aba0bh/1409989131d Inode: 1407374883725128 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ ian) Gid: ( 513/ None) Access: 2011-12-02 16:59:10.118457900 +0000 Modify: 2011-12-02 16:59:10.118457900 +0000 Change: 2011-12-02 16:59:06.189477700 +0000 Birth: 2011-12-02 16:57:57.731469900 +0000 File: `bar' Size: 0 Blocks: 0 IO Block: 65536 regular empty file Device: 540aba0bh/1409989131d Inode: 281474976882512 Links: 1 Access: (0644/-rw-r--r--) Uid: ( 1000/ ian) Gid: ( 513/ None) Access: 2011-12-02 16:59:06.394555800 +0000 Modify: 2011-12-02 16:59:06.394555800 +0000 Change: 2011-12-02 16:59:06.395532400 +0000 Birth: 2011-12-02 16:58:40.921899600 +0000 This means that make thinks that things are out of date when it shouldn't, so reinvokes itself repeatedly until the MAKE_RESTARTS infinite-recursion test triggers. The touchy program, like most other programs, creates files with both Modify and Change in the past, which is still a little odd, but is consistent, so doesn't break make.
* Fixes for NetBSDIan Lynagh2011-11-251-0/+1
| | | | | Based on a patch from Arnaud Degroote <degroote@NetBSD.org> in trac #5480.
* mergeSimon Marlow2011-11-221-0/+3
|\
| * Add autoconf support to detect an LLVM-based C compilerDavid M Peixotto2011-10-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support to the autoconf scripts to detect when we are using a C compiler that uses an LLVM back end. An LLVM back end does not support all of the extensions use by GCC, so we need to perform some conditional compilation in the runtime, particularly for handling thread local storage and global register variables. The changes here will set the CC_LLVM_BACKEND in the autoconf scripts if we detect an llvm-based compiler. We use this variable to define the llvm_CC_FLAVOR variable that we can use in the runtime code to conditionally compile for LLVM.
* | Improve the way we call "rm" in the build system; fixes trac #4916Ian Lynagh2011-11-191-0/+21
| | | | | | | | | | | | | | | | | | | | We avoid calling "rm -rf" with no file arguments; this fixes cleaning on Solaris, where that fails. We also check for suspicious arguments: anything containing "..", starting "/", or containing a "*" (you need to call $(wildcard ...) yourself now if you really want globbing). This should make things a little safer.
* | Make the --fast option to validate faster, and add --normalSimon Marlow2011-11-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | The --fast option now disables the following: - dynamic libs - bindist and bindisttest Which knocks several minutes off validate for me, but it's still over 30 minutes using 5 cores on 64-bit Linux. Usual caveats apply: if you're using --fast, then make sure you aren't doing anything that might destabilise dynamic libs or binary dists.
* | Build system wibbles for new dph-lifted-vseg libraryBen Lippmeier2011-11-121-2/+1
| | | | | | | | The old dph-par and dph-seq CPP libraries are gone. The DPH front end libraries are now dph-lifted-*, and are only built in one way.
* | validate: add -dcore-lint to stage2Simon Marlow2011-11-101-1/+1
| |
* | Use -fwarn-tabs when validatingIan Lynagh2011-11-041-2/+2
| | | | | | | | | | We only use it for "compiler" sources, i.e. not for libraries. Many modules have a -fno-warn-tabs kludge for now.
* | minor bugfix for 'make re2' etc.Simon Marlow2011-11-021-1/+1
| |
* | Enable dynamic libraries on OSX amd64Ian Lynagh2011-10-251-5/+6
| | | | | | | | I don't know why it wasn't already enabled, but it seems to work.
* | Follow cabal->Cabal rename, and fix haddock index generationIan Lynagh2011-10-231-2/+2
| | | | | | | | We now make use of the ghc-packages file when making the haddock index.
* | FIX BUILD on OS X 10.5: Check whether ld understands -no_compact_unwindThorkil Naur2011-10-191-0/+4
| |
* | Merge branch 'master' of http://darcs.haskell.org/ghcIan Lynagh2011-10-181-1/+1
|\ \
| * | build registerised on ARM platform by defaultKarel Gardas2011-10-171-1/+1
| | |
* | | Get Windows building dynlibs againIan Lynagh2011-10-181-5/+0
|/ /
* | Temporary hack to get Windows to validate againIan Lynagh2011-10-141-0/+5
|/ | | | For now, turn off dynlibs when validating
* workaround for #5485: use -fno-full-laziness with 7.2.1Simon Marlow2011-10-051-0/+10
|