From 612af7ff66e0d5018bb696ff0140805bc8b5194e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 6 Mar 2017 21:54:19 +0000 Subject: [PATCH] gnu: re2: Set CXX for cross-compilation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/regex.scm (re2)[arguments]: Specify CXX in #:make-flags. Signed-off-by: Ludovic Courtès --- gnu/packages/regex.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 11f4716033..f55faaf042 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -22,7 +22,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix utils)) (define-public re2 (package @@ -42,7 +43,16 @@ (arguments `(#:test-target "test" ;; 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 (modify-phases %standard-phases (delete 'configure)