[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: gcc-final: Remove unnecessary CPPFLAGS.
From: |
Ludovic Courtès |
Subject: |
01/02: gnu: gcc-final: Remove unnecessary CPPFLAGS. |
Date: |
Fri, 11 Dec 2015 23:04:05 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 52cfd8cb54e011f3446bf6697a69783b60ef835d
Author: Ludovic Courtès <address@hidden>
Date: Fri Dec 11 23:42:39 2015 +0100
gnu: gcc-final: Remove unnecessary CPPFLAGS.
* gnu/packages/commencement.scm (gcc-final)[arguments]: Remove
unnecessary CPPFLAGS from #:make-flags.
---
gnu/packages/commencement.scm | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 102f2ae..b958544 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -582,18 +582,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"address@hidden"~%"
((_ rest ...)
(loop rest)))))
((#:make-flags flags)
- ;; Since $LIBRARY_PATH and $CPATH are not honored, add the
- ;; relevant flags.
- `(cons (string-append "CPPFLAGS=-I"
- (assoc-ref %build-inputs "libstdc++")
- "/include")
- (map (lambda (flag)
- (if (string-prefix? "LDFLAGS=" flag)
- (string-append flag " -L"
- (assoc-ref %build-inputs
"libstdc++")
- "/lib")
- flag))
- ,flags)))
+ ;; Since $LIBRARY_PATH is not honored, add the relevant flags.
+ `(map (lambda (flag)
+ (if (string-prefix? "LDFLAGS=" flag)
+ (string-append flag " -L"
+ (assoc-ref %build-inputs "libstdc++")
+ "/lib")
+ flag))
+ ,flags))
((#:phases phases)
`(alist-delete 'symlink-libgcc_eh ,phases)))))