nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: re2: Set CXX for cross-compilation. 

* gnu/packages/regex.scm (re2)[arguments]: Specify CXX in #:make-flags.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Sergei Trofimovich 2017-03-06 21:54:19 +00:00 committed by Ludovic Courtès
parent e7b9dac7b1
commit 612af7ff66
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/regex.scm
View File

@ -22,7 +22,8 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu)
#:use-module (guix utils))
(define-public re2 (define-public re2
(package (package
@ -42,7 +43,16 @@
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
;; There is no configure step, but the Makefile respects a prefix. ;; There is no configure step, but the Makefile respects a prefix.
#:make-flags (list (string-append "prefix=" %output)) ;; As ./configure does not know anything about the target CXX
;; we need to specify TARGET-g++ explicitly.
#:make-flags (list (string-append "prefix=" %output)
(string-append
"CXX=" ,(string-append
(if (%current-target-system)
(string-append
(%current-target-system) "-")
"")
"g++")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)