aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-12-11 23:42:39 +0100
committerLudovic Courtès <ludo@gnu.org>2015-12-11 23:42:39 +0100
commit52cfd8cb54e011f3446bf6697a69783b60ef835d (patch)
tree656d988a88ef23920cddda48025c23ac684db562 /gnu
parent557b5557d83d29b1616b6e19dabe4d4d1ef7fcc1 (diff)
downloadguix-52cfd8cb54e011f3446bf6697a69783b60ef835d.tar
guix-52cfd8cb54e011f3446bf6697a69783b60ef835d.tar.gz
gnu: gcc-final: Remove unnecessary CPPFLAGS.
* gnu/packages/commencement.scm (gcc-final)[arguments]: Remove unnecessary CPPFLAGS from #:make-flags.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/commencement.scm20
1 files changed, 8 insertions, 12 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 102f2aee0f..b958544e25 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 \"$@\"~%"
((_ 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)))))