aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2016-01-11 19:43:25 +0100
committerRicardo Wurmus <rekado@elephly.net>2016-01-13 22:32:37 +0100
commitca7ef4d41854218c6e6910e1b7d9224382252c58 (patch)
tree16645844aebd8c62364063df6c767e6941a26fe6
parent724eaef1b2b9aef206c35361fc6ec2ed149cf26c (diff)
downloadguix-ca7ef4d41854218c6e6910e1b7d9224382252c58.tar
guix-ca7ef4d41854218c6e6910e1b7d9224382252c58.tar.gz
gnu: cross-gcc-arguments: Enable C++, disable building of libstdc++-v3.
* gnu/packages/cross-base.scm (cross-gcc-arguments)[arguments]: Disable building libstdc++-v3 and enable building C++ compiler.
-rw-r--r--gnu/packages/cross-base.scm9
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index cefe2f947f..8bd599c25a 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -105,11 +105,12 @@ may be either a libc package or #f.)"
"--disable-libcilkrts")
`( ;; Disable features not needed at this stage.
"--disable-shared" "--enable-static"
+ "--enable-languages=c,c++"
- ;; Disable C++ because libstdc++'s configure
- ;; script otherwise fails with "Link tests are not
- ;; allowed after GCC_NO_EXECUTABLES."
- "--enable-languages=c"
+ ;; libstdc++ cannot be built at this stage
+ ;; ("Link tests are not allowed after
+ ;; GCC_NO_EXECUTABLES.").
+ "--disable-libstdc++-v3"
"--disable-threads" ;libgcc, would need libc
"--disable-libatomic"