(define-public glibc/hurd 
  (package (inherit glibc)
           (name "glibc-hurd")
           (source (origin
                     (method git-fetch)
                     (uri (git-reference
                           (url "git://git.sv.gnu.org/hurd/glibc")
                           (commit "bdb7a18d78b04ac3ef7a2d905485500f13bb69fb")))
                     (sha256
                      (base32
                       "0v4hy6yimshbvhbhdbbjdir5fm3xr56zj3lnpf01d4nfa0c1h8k1"))
                     (patches (list (search-patch "glibc-make-4.0.patch"))) ;; <-- if you comment this out it works as expected
                    ))
           (propagated-inputs `(("gnumach-headers" ,gnumach-headers)
                                ("hurd-headers" ,hurd-headers)))
           (arguments
            `(#:out-of-source? #t
              #:phases (alist-cons-before
                        'configure 'pre-configure
                        (lambda* (#:key inputs outputs #:allow-other-keys)
                          (let* ((out  (assoc-ref outputs "out"))
                                 (bin  (string-append out "/bin")))
                            ;; Use `pwd', not `/bin/pwd'.
                            (substitute* "configure"
                              (("/bin/pwd") "pwd"))       
                            (alist-replace
                             'unpack
                             ;; FIXME: Remove this when gnu-build-system handles that
                             ;; case correctly.
                             (lambda* (#:key source #:allow-other-keys)                                        
                               (mkdir "source")
                               (chdir "source")
                               (copy-recursively source ".")
                               #t)
                             %standard-phases))))))
           
;; (inputs ...)
))