[commit: ghc] master: add $(CrossCompilePrefix) to hp2ps (#7639) (b0fad0c)

[Simon Marlow]

Could we have $(CrossCompilePrefix)build.mk be a fallback if build.mk 
doesn't exist?

I don't want to have to rename my build.mk when I'm only using it on one 
platform.  Also we'd have to update a bunch of documentation and deal 
with users who are confused that their build.mk is being ignored.

Cheers,
	Simon


On 01/02/13 09:39, Gabor Greif wrote:
> Hi Simon, all,
>
> this reminds me of a local patch (see below), that allows one to keep
> different 'build.mk' customizations for cross targets and normal
> builds at the same time, so the error-prone manual swapping of these
> is automated. OK to push?
>
> Cheers,
>
>       Gabor
>
> #####################################################
>
> [ggreif-hc_stm-r6.0][!1180] git show b716a1132010cccbf87612b4c1b0816c0585eb91
> commit b716a1132010cccbf87612b4c1b0816c0585eb91
> Author: Gabor Greif <ggreif at gmail.com>
> Date:   Fri Nov 23 17:54:00 2012 +0100
>
>      allow different customizations per cross target
>
> diff --git a/mk/custom-settings.mk b/mk/custom-settings.mk
> index e64bb36..3390888 100644
> --- a/mk/custom-settings.mk
> +++ b/mk/custom-settings.mk
> @@ -5,7 +5,7 @@ ifeq "$(Validating)" "YES"
>   include mk/validate-settings.mk
>   -include mk/validate.mk
>   else
> --include mk/build.mk
> +-include mk/$(CrossCompilePrefix)build.mk
>   endif
>
>   ifeq "$(BINDIST)" "YES"
>
>
>
>
> On 2/1/13, Simon Marlow <marlowsd at gmail.com> wrote:
>> Repository : ssh://darcs.haskell.org//srv/darcs/ghc
>>
>> On branch  : master
>>
>> http://hackage.haskell.org/trac/ghc/changeset/b0fad0c580e0dd52d73743a877608af60408ec89
>>
>>> ---------------------------------------------------------------
>>
>> commit b0fad0c580e0dd52d73743a877608af60408ec89
>> Author: Simon Marlow <marlowsd at gmail.com>
>> Date:   Thu Jan 31 12:05:03 2013 +0000
>>
>>      add $(CrossCompilePrefix) to hp2ps (#7639)
>>
>>> ---------------------------------------------------------------
>>
>>   utils/hp2ps/ghc.mk |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/utils/hp2ps/ghc.mk b/utils/hp2ps/ghc.mk
>> index 59791c8..097f912 100644
>> --- a/utils/hp2ps/ghc.mk
>> +++ b/utils/hp2ps/ghc.mk
>> @@ -16,7 +16,7 @@ utils/hp2ps_dist_C_SRCS          = AreaBelow.c Curves.c
>> Error.c Main.c \
>>                                      Axes.c Dimensions.c Key.c PsFile.c
>> Shade.c \
>>                                      Utilities.c
>>   utils/hp2ps_dist_EXTRA_LIBRARIES = m
>> -utils/hp2ps_dist_PROG            = hp2ps$(exeext)
>> +utils/hp2ps_dist_PROG            = $(CrossCompilePrefix)hp2ps$(exeext)
>>   utils/hp2ps_dist_INSTALL         = YES
>>   utils/hp2ps_dist_INSTALL_INPLACE = YES
>>
>>
>>
>>
>> _______________________________________________
>> ghc-commits mailing list
>> ghc-commits at haskell.org
>> http://www.haskell.org/mailman/listinfo/ghc-commits
>>
>
> _______________________________________________
> ghc-devs mailing list
> ghc-devs at haskell.org
> http://www.haskell.org/mailman/listinfo/ghc-devs
>