diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-11-19 12:54:54 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2015-11-19 13:24:33 +0100 |
| commit | 65d7ff06573f8c55ec98b43059f7abffae79d8c3 (patch) | |
| tree | 03081a264ec491d1127845186193515554a87195 /configure.ac | |
| parent | 3e2a4eefbed7002437c3f3ee340832a42f0b37f8 (diff) | |
| download | haskell-65d7ff06573f8c55ec98b43059f7abffae79d8c3.tar.gz | |
Make `derivedConstants` more crosscompile-friendly
`derivedConstants` currently uses `System.Info.os` for decisions (which
doesn't necessarily reflect the build-target), as well as hardcoding
"/usr/bin/objdump" for openbsd.
This patch auto-detects `objdump` similiar to how `nm` is detected via
Autoconf as well as passing the target-os into `derivedConstants` via
commandline.
Reviewers: austin, kgardas, erikd, bgamari
Reviewed By: kgardas, erikd, bgamari
Subscribers: kgardas, thomie, erikd
Differential Revision: https://phabricator.haskell.org/D1499
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 1e43896727..99fd892d89 100644 --- a/configure.ac +++ b/configure.ac @@ -478,6 +478,12 @@ FP_ARG_WITH_PATH_GNU_PROG([NM], [nm], [nm]) NmCmd="$NM" AC_SUBST([NmCmd]) +dnl ** Which objdump to use? +dnl -------------------------------------------------------------- +FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL([OBJDUMP], [objdump], [objdump]) +ObjdumpCmd="$OBJDUMP" +AC_SUBST([ObjdumpCmd]) + dnl ** Which ar to use? dnl -------------------------------------------------------------- FP_ARG_WITH_PATH_GNU_PROG([AR], [ar], [ar]) @@ -1152,6 +1158,8 @@ echo ["\ hs-cpp : $HaskellCPPCmd hs-cpp-flags : $HaskellCPPArgs ld : $LdCmd + nm : $NmCmd + objdump : $ObjdumpCmd Happy : $HappyCmd ($HappyVersion) Alex : $AlexCmd ($AlexVersion) Perl : $PerlCmd |