Re: [GHC] #8139: ghc 7.6.3 and ghc HEAD fails to build on OS X 10.9

#8139: ghc 7.6.3 and ghc HEAD fails to build on OS X 10.9 -------------------------------------+------------------------------------- Reporter: darinmorrison | Owner: Type: bug | Status: new Priority: normal | Milestone: 7.8.1 Component: Compiler | Version: 7.7 Resolution: | Keywords: Operating System: MacOS X | Architecture: x86_64 (amd64) Type of failure: Building GHC | Difficulty: Easy (less than 1 failed | hour) Test Case: | Blocked By: Blocking: | Related Tickets: -------------------------------------+------------------------------------- Comment (by darinmorrison): I've modified the patch slightly so that it is no longer triggered except on OS X and version 10.9 specifically. {{{ diff --git a/includes/HsFFI.h b/includes/HsFFI.h index 652fbea..a21811e 100644 --- a/includes/HsFFI.h +++ b/includes/HsFFI.h @@ -21,7 +21,7 @@ extern "C" { #include "stg/Types.h" /* get limits for integral types */ -#ifdef HAVE_STDINT_H +#if defined HAVE_STDINT_H && !defined USE_INTTYPES_H_FOR_RTS_PROBES_D /* ISO C 99 says: * "C++ implementations should define these macros only when * __STDC_LIMIT_MACROS is defined before is included." diff --git a/rts/RtsProbes.d b/rts/RtsProbes.d index 13f40f8..226f881 100644 --- a/rts/RtsProbes.d +++ b/rts/RtsProbes.d @@ -6,6 +6,12 @@ * * ---------------------------------------------------------------------------*/ +#ifdef __APPLE__ && __MACH__ +# if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +# define USE_INTTYPES_H_FOR_RTS_PROBES_D +# endif +#endif + #include "HsFFI.h" #include "rts/EventLogFormat.h" diff --git a/utils/mkdirhier/mkdirhier.sh b/utils/mkdirhier/mkdirhier.sh index 4c5d5f7..80762f4 100644 --- a/utils/mkdirhier/mkdirhier.sh +++ b/utils/mkdirhier/mkdirhier.sh @@ -1,4 +1,4 @@ #!/bin/sh -mkdir -p ${1+"$@"} +mkdir -p ${1+"./$@"} }}} -- Ticket URL: http://ghc.haskell.org/trac/ghc/ticket/8139#comment:6 GHC http://www.haskell.org/ghc/ The Glasgow Haskell Compiler