mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: gcc: Do not always disable RUNPATH validation.
* gnu/packages/gcc.scm (gcc-4.7)[arguments]: Remove explicit #:validate-runpath? #f. * gnu/packages/commencement.scm (gcc-boot0)[arguments]: Remove case for #:validate-runpath?. (gcc-final)[arguments]: Add literal #:validate-runpath? #f. * gnu/packages/cross-base.scm (cross-gcc-arguments): Remove case for #:validate-runpath?.
This commit is contained in:
parent
21e583def3
commit
d485ebba42
3 changed files with 5 additions and 13 deletions
|
@ -158,8 +158,6 @@ (define gcc-boot0
|
|||
(srfi srfi-1)
|
||||
(srfi srfi-26))
|
||||
,@(substitute-keyword-arguments (package-arguments gcc-4.8)
|
||||
((#:validate-runpath? _)
|
||||
#t)
|
||||
((#:configure-flags flags)
|
||||
`(append (list ,(string-append "--target=" (boot-triplet))
|
||||
|
||||
|
@ -540,6 +538,11 @@ (define-public gcc-final
|
|||
|
||||
#:allowed-references ("out" "lib" ,glibc-final)
|
||||
|
||||
;; Things like libasan.so and libstdc++.so NEED ld.so for some
|
||||
;; reason, but it is not in their RUNPATH. This is a false
|
||||
;; positive, so turn it off.
|
||||
#:validate-runpath? #f
|
||||
|
||||
;; Build again GMP & co. within GCC's build process, because it's hard
|
||||
;; to do outside (because GCC-BOOT0 is a cross-compiler, and thus
|
||||
;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.)
|
||||
|
@ -564,11 +567,6 @@ (define-public gcc-final
|
|||
"/lib")
|
||||
flag))
|
||||
,flags)))
|
||||
((#:validate-runpath? _)
|
||||
;; Things like libasan.so and libstdc++.so NEED ld.so and/or
|
||||
;; libgcc_s.so but RUNPATH is empty. This is a false positive, so
|
||||
;; turn it off.
|
||||
#f)
|
||||
((#:phases phases)
|
||||
`(alist-delete 'symlink-libgcc_eh ,phases)))))
|
||||
|
||||
|
|
|
@ -175,8 +175,6 @@ (define (cross? x)
|
|||
#t)))
|
||||
,phases)
|
||||
phases)))
|
||||
((#:validate-runpath? _)
|
||||
#t)
|
||||
((#:strip-binaries? _)
|
||||
;; Disable stripping as this can break binaries, with object files of
|
||||
;; libgcc.a showing up as having an unknown architecture. See
|
||||
|
|
|
@ -190,10 +190,6 @@ (define-public gcc-4.7
|
|||
|
||||
#:tests? #f
|
||||
|
||||
;; libstdc++.so NEEDs libgcc_s.so but somehow it doesn't get
|
||||
;; $(libdir) in its RUNPATH, so turn it off.
|
||||
#:validate-runpath? #f
|
||||
|
||||
#:phases
|
||||
(alist-cons-before
|
||||
'configure 'pre-configure
|
||||
|
|
Loading…
Reference in a new issue