summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-05 16:47:39 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-11 13:39:16 +0000
commit037bd07f3d6bfaf02bd03b5125d7535ca76c244f (patch)
tree64084d4f676a7c40f8185accb1642f19d311c01f
parent6674fab4b573410cad14a8739cf6383d17fb25d1 (diff)
downloadgcc-tarball-037bd07f3d6bfaf02bd03b5125d7535ca76c244f.tar.gz
Honour TARGET_GCC_CONFIG in all morphologies
On some architectures we need to pass flags to GCC's configure, e.g. --with-arch=armv7-a. Currently this must be specified manually in the morph.conf file when building on such a system. Ideally in the future we would bake this setting directly into the system image to reduce potential for failure.
-rw-r--r--gcc.morph2
-rw-r--r--gcc.morph.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc.morph b/gcc.morph
index 3eddfbfa65..04399b9419 100644
--- a/gcc.morph
+++ b/gcc.morph
@@ -3,7 +3,7 @@
"kind": "chunk",
"configure-commands": [
"mkdir o",
- "cd o && \\\n../configure --prefix=\"$PREFIX\" --disable-nls \\\n `# [1]` --libdir=$PREFIX/lib \\\n `# [2]` --disable-multilib \\\n `# [3]` --disable-libgomp --without-cloog --without-ppl \\\n `# [4]` --enable-__cxa_atexit \\\n `# [5]` --with-mpfr-include=\"$(pwd)/../mpfr/src\" \\\n --with-mpfr-lib=\"$(pwd)/mpfr/src/.libs\" \\\n --enable-languages=c,c++ --enable-threads=posix\n"
+ "cd o && \\\n../configure --prefix=\"$PREFIX\" --disable-nls $TARGET_GCC_CONFIG \\\n `# [1]` --libdir=$PREFIX/lib \\\n `# [2]` --disable-multilib \\\n `# [3]` --disable-libgomp --without-cloog --without-ppl \\\n `# [4]` --enable-__cxa_atexit \\\n `# [5]` --with-mpfr-include=\"$(pwd)/../mpfr/src\" \\\n --with-mpfr-lib=\"$(pwd)/mpfr/src/.libs\" \\\n --enable-languages=c,c++ --enable-threads=posix\n"
],
"build-commands": [
"cd o && make"
diff --git a/gcc.morph.yaml b/gcc.morph.yaml
index 05ffe9801a..486bea978e 100644
--- a/gcc.morph.yaml
+++ b/gcc.morph.yaml
@@ -13,7 +13,7 @@ configure-commands:
# 5. MPFR is built in the GCC tree, we need to locate it.
- |
cd o && \
- ../configure --prefix="$PREFIX" --disable-nls \
+ ../configure --prefix="$PREFIX" --disable-nls $TARGET_GCC_CONFIG \
`# [1]` --libdir=$PREFIX/lib \
`# [2]` --disable-multilib \
`# [3]` --disable-libgomp --without-cloog --without-ppl \