diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | mk/config.mk.in | 4 | ||||
| -rw-r--r-- | rules/build-package-data.mk | 5 |
3 files changed, 2 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index dbc19de80e..7d522b0998 100644 --- a/configure.ac +++ b/configure.ac @@ -122,9 +122,7 @@ if test "$WithGhc" != ""; then GhcCanonVersion="$GhcMajVersion$GhcMinVersion2" BOOTSTRAPPING_GHC_INFO_FIELD([CC_STAGE0],[C compiler command]) - dnl ToDo, once "ld command" is reliably available. - dnl Then, we can remove the LD_STAGE0 hack in mk/build-package-date.mk - dnl BOOTSTRAPPING_GHC_INFO_FIELD([LD_STAGE0],[ld command]) + BOOTSTRAPPING_GHC_INFO_FIELD([LD_STAGE0],[ld command]) BOOTSTRAPPING_GHC_INFO_FIELD([AR_STAGE0],[ar command]) BOOTSTRAPPING_GHC_INFO_FIELD([AR_OPTS_STAGE0],[ar flags]) BOOTSTRAPPING_GHC_INFO_FIELD([ArSupportsAtFile_STAGE0],[ar supports at file]) diff --git a/mk/config.mk.in b/mk/config.mk.in index d2bf321f90..5d5e581a43 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -539,9 +539,7 @@ AS_STAGE1 = $(AS) AS_STAGE2 = $(AS) AS_STAGE3 = $(AS) -# We don't have an LD_STAGE0. CC_STAGE0 is determined by asking "ghc -# --info", and it doesn't report an LD. -LD_STAGE0 = error-no-ld-stage0 +LD_STAGE0 = @LD_STAGE0@ LD_STAGE1 = $(LD) LD_STAGE2 = $(LD) LD_STAGE3 = $(LD) diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index e46ecd6d61..89b742c613 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -105,12 +105,7 @@ $1_$2_CONFIGURE_OPTS += $$(BOOT_PKG_CONSTRAINTS) endif $1_$2_CONFIGURE_OPTS += --with-gcc="$$(CC_STAGE$3)" - -ifneq "$3" "0" -# There is no LD_STAGE0, Cabal will figure it out $1_$2_CONFIGURE_OPTS += --with-ld="$$(LD_STAGE$3)" -endif - $1_$2_CONFIGURE_OPTS += --with-ar="$$(AR_STAGE$3)" $1_$2_CONFIGURE_OPTS += $$(if $$(ALEX),--with-alex="$$(ALEX)") $1_$2_CONFIGURE_OPTS += $$(if $$(HAPPY),--with-happy="$$(HAPPY)") |