diff options
| author | GHC GitLab CI <ghc-ci@gitlab-haskell.org> | 2022-01-20 13:54:02 -0500 |
|---|---|---|
| committer | GHC GitLab CI <ghc-ci@gitlab-haskell.org> | 2022-01-20 13:54:02 -0500 |
| commit | dd13acd2b146f2a01634d5c3c8f4a03e97241f8d (patch) | |
| tree | f643acc173e11f5bcbc4930474d2bbfc307faa55 | |
| parent | f01638ca111df9b7c865198a2f0ce064d89dc63c (diff) | |
| download | haskell-dd13acd2b146f2a01634d5c3c8f4a03e97241f8d.tar.gz | |
Build system hacks for clang
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | m4/fp_settings.m4 | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index cb670a2a14..0ef8dfc371 100644 --- a/configure.ac +++ b/configure.ac @@ -434,12 +434,12 @@ then set_up_tarballs mingwbin="$hardtop/inplace/mingw/bin/" - CC="${mingwbin}gcc.exe" - LD="${mingwbin}ld.exe" + CC="/mingw64/bin/clang.exe" + LD="/usr/bin/ld.lld.exe" NM="${mingwbin}nm.exe" RANLIB="${mingwbin}ranlib.exe" OBJDUMP="${mingwbin}objdump.exe" - MergeObjsCmd="$LD" + MergeObjsCmd="${mingwbin}ld.exe" MergeObjsArgs="-r --oformat=pe-bigobj-x86-64" fp_prog_ar="${mingwbin}ar.exe" diff --git a/m4/fp_settings.m4 b/m4/fp_settings.m4 index 09a24f33e1..942a33eef0 100644 --- a/m4/fp_settings.m4 +++ b/m4/fp_settings.m4 @@ -7,8 +7,6 @@ AC_DEFUN([FP_SETTINGS], if test "$windows" = YES -a "$EnableDistroToolchain" = "NO" then mingw_bin_prefix='$$tooldir/mingw/bin/' - SettingsCCompilerCommand="${mingw_bin_prefix}gcc.exe" - SettingsHaskellCPPCommand="${mingw_bin_prefix}gcc.exe" SettingsHaskellCPPFlags="$HaskellCPPArgs" SettingsLdCommand="${mingw_bin_prefix}ld.exe" # Overrides FIND_MERGE_OBJECTS in order to avoid hard-coding linker |