gnu: glibc-intermediate: Fixup the pre-configure phase.
* gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)[arguments]: Don't patch sunrpc, as it's no longer required. Tweak C_INCLUDE_PATH and CPLUS_INCLUDE_PATH instead of CPATH.
This commit is contained in:
parent
ef08c5d4d2
commit
7cde865f12
|
@ -3273,9 +3273,9 @@ memoized as a function of '%current-system'."
|
||||||
`(modify-phases ,phases
|
`(modify-phases ,phases
|
||||||
(add-before 'configure 'pre-configure
|
(add-before 'configure 'pre-configure
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
;; Don't clobber CPATH with the bootstrap libc.
|
;; Don't clobber include paths with the bootstrap libc.
|
||||||
(setenv "NATIVE_CPATH" (getenv "CPATH"))
|
(unsetenv "C_INCLUDE_PATH")
|
||||||
(unsetenv "CPATH")
|
(unsetenv "CPLUS_INCLUDE_PATH")
|
||||||
|
|
||||||
;; Tell 'libpthread' where to find 'libihash' on Hurd systems.
|
;; Tell 'libpthread' where to find 'libihash' on Hurd systems.
|
||||||
,@(if (hurd-system?)
|
,@(if (hurd-system?)
|
||||||
|
@ -3286,13 +3286,6 @@ memoized as a function of '%current-system'."
|
||||||
(assoc-ref %build-inputs "kernel-headers")
|
(assoc-ref %build-inputs "kernel-headers")
|
||||||
"/lib/libihash.a\n"))))
|
"/lib/libihash.a\n"))))
|
||||||
'())
|
'())
|
||||||
|
|
||||||
;; 'rpcgen' needs native libc headers to be built.
|
|
||||||
(substitute* "sunrpc/Makefile"
|
|
||||||
(("sunrpc-CPPFLAGS =.*" all)
|
|
||||||
(string-append "CPATH = $(NATIVE_CPATH)\n"
|
|
||||||
"export CPATH\n"
|
|
||||||
all "\n")))
|
|
||||||
#t)))))))
|
#t)))))))
|
||||||
(propagated-inputs `(("kernel-headers" ,(kernel-headers-boot0))))
|
(propagated-inputs `(("kernel-headers" ,(kernel-headers-boot0))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
|
|
Loading…
Reference in New Issue