diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-15 13:53:08 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-01-15 13:53:47 -0500 |
| commit | 8de8930520dce26ffa4fa1e67a977213de667e16 (patch) | |
| tree | 0f7f0bf88bff479e95b2e649a28cdca9f6a8aa88 /configure.ac | |
| parent | bc383f20ce29c5059d8c9c322246ac38bfb0c2a8 (diff) | |
| download | haskell-8de8930520dce26ffa4fa1e67a977213de667e16.tar.gz | |
configure: Various cleanups
Substitute RanlibCmd for consistency, and other configure cleanups that
should have no effect
The other commands are so substituted. Maybe we don't need ranlib at
all, and the configure snippet can be removed all together, but that
can always be done later.
Reviewers: bgamari, hvr, angerman
Reviewed By: bgamari, angerman
Subscribers: rwbarton, thomie, erikd, carter
Differential Revision: https://phabricator.haskell.org/D4286
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 6733385b2b..216a97fb49 100644 --- a/configure.ac +++ b/configure.ac @@ -538,7 +538,7 @@ FP_SET_CFLAGS_C99([CC_STAGE0],[CONF_CC_OPTS_STAGE0],[CONF_CPP_OPTS_STAGE0]) FP_SET_CFLAGS_C99([CC],[CONF_CC_OPTS_STAGE1],[CONF_CPP_OPTS_STAGE1]) FP_SET_CFLAGS_C99([CC],[CONF_CC_OPTS_STAGE2],[CONF_CPP_OPTS_STAGE2]) -dnl ** Choose a linker +dnl ** Which ld to use dnl -------------------------------------------------------------- FIND_LD([$target],[GccUseLdOpt]) CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 $GccUseLdOpt" @@ -547,6 +547,11 @@ LdCmd="$LD" CFLAGS="$CFLAGS $GccUseLdOpt" AC_SUBST([LdCmd]) +FP_PROG_LD_IS_GNU +FP_PROG_LD_BUILD_ID +FP_PROG_LD_NO_COMPACT_UNWIND +FP_PROG_LD_FILELIST + dnl ** Which nm to use? dnl -------------------------------------------------------------- if test "$HostOS" != "mingw32"; then @@ -603,7 +608,7 @@ if test "$RANLIB" = ":"; then AC_MSG_ERROR([cannot find ranlib in your PATH]) fi RanlibCmd="$RANLIB" -RANLIB="$RanlibCmd" +AC_SUBST([RanlibCmd]) dnl ** which strip to use? dnl -------------------------------------------------------------- @@ -624,7 +629,6 @@ then else AC_CHECK_TARGET_TOOL([LIBTOOL], [libtool]) LibtoolCmd="$LIBTOOL" - LIBTOOL="$LibtoolCmd" fi AC_SUBST([LibtoolCmd]) @@ -708,23 +712,18 @@ FP_GCC_VERSION dnl ** See whether gcc supports -no-pie FP_GCC_SUPPORTS_NO_PIE +FP_GCC_EXTRA_FLAGS + dnl ** look to see if we have a C compiler using an llvm back end. dnl FP_CC_LLVM_BACKEND -FP_PROG_LD_IS_GNU -FP_PROG_LD_BUILD_ID -FP_PROG_LD_NO_COMPACT_UNWIND -FP_PROG_LD_FILELIST - FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS],[IGNORE_LINKER_LD_FLAGS],[CPPFLAGS]) FPTOOLS_SET_C_LD_FLAGS([build],[CONF_CC_OPTS_STAGE0],[CONF_GCC_LINKER_OPTS_STAGE0],[CONF_LD_LINKER_OPTS_STAGE0],[CONF_CPP_OPTS_STAGE0]) FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_GCC_LINKER_OPTS_STAGE1],[CONF_LD_LINKER_OPTS_STAGE1],[CONF_CPP_OPTS_STAGE1]) FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_GCC_LINKER_OPTS_STAGE2],[CONF_LD_LINKER_OPTS_STAGE2],[CONF_CPP_OPTS_STAGE2]) # Stage 3 won't be supported by cross-compilation -FP_GCC_EXTRA_FLAGS - # See rules/distdir-way-opts.mk for details. # Flags passed to the C compiler AC_SUBST(CONF_CC_OPTS_STAGE0) |