Subject: [PATCH] gnu: re2: fix CXX for cross-compilation

From: Sergei Trofimovich <[email-masked]>
Date: Mon, 6 Mar 2017 21:54:19 +0000

* gnu/packages/regex.scm(re2): propagate target-g++ for CXX
---
 gnu/packages/regex.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm
index 11f471603..144699853 100644
--- a/gnu/packages/regex.scm
+++ b/gnu/packages/regex.scm
@@ -22,7 +22,9 @@
   #: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 +44,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 known anything about 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)
-- 
2.12.0