diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-03-01 16:14:35 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-03-01 16:14:35 +0000 |
| commit | c999c0af13da24ab1ea3ed5ec606574439144f08 (patch) | |
| tree | 1a4eb65fa481351d3a95ddff15d9b53cfee79a71 | |
| parent | 3db7bd59b069e01ae9677175b89a5bbcd1c52d4b (diff) | |
| parent | 0053706bc83c393ea077c5170f88d20cffb0a0af (diff) | |
| download | gcc-tarball-baserock/morph.tar.gz | |
Merge branch 'baserock/jonathan/gcc-morph-only' into baserock/morphbaserock/morph
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
| -rw-r--r-- | cxx-dynamic.morph | 17 | ||||
| -rw-r--r-- | gcc-shared.morph | 18 | ||||
| -rw-r--r-- | gcc.morph | 2 |
3 files changed, 1 insertions, 36 deletions
diff --git a/cxx-dynamic.morph b/cxx-dynamic.morph deleted file mode 100644 index e65d35217a..0000000000 --- a/cxx-dynamic.morph +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "cxx-dynamic", - "kind": "chunk", - "configure-commands": [ - "sed -i 's@\\./fixinc\\.sh@-c true@' gcc/Makefile.in", - "mkdir o", - "cd o && ../configure --prefix=/usr --enable-clocale=gnu --enable-shared --enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch --disable-multilib --disable-libgomp --without-ppl --without-cloog" - ], - "build-commands": [ - "cd o && make" - ], - "install-commands": [ - "cd o && make DESTDIR=\"$DESTDIR\" install-target-libstdc++-v3", - "cd o && make DESTDIR=\"$DESTDIR\" install-target-libgcc" - ] -} - diff --git a/gcc-shared.morph b/gcc-shared.morph deleted file mode 100644 index abf8ee24ff..0000000000 --- a/gcc-shared.morph +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "gcc-shared", - "kind": "chunk", - "configure-commands": [ - "sed -i 's@\\./fixinc\\.sh@-c true@' gcc/Makefile.in", - "mkdir o", - "cd o && ../configure --prefix=/usr --enable-clocale=gnu --enable-shared --enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch --disable-multilib --disable-libgomp --without-ppl --without-cloog" - ], - "build-commands": [ - "cd o && make" - ], - "install-commands": [ - "cd o && make DESTDIR=\"$DESTDIR\" install", - "for f in `find \"$DESTDIR\" -name libgcc.a`; do EH=\"`echo \"$f\" | sed 's/libgcc/&_eh/'`\" && if [ ! -e \"$EH\" ]; then ln -s libgcc.a \"$EH\"; fi; done", - "ln -s gcc \"$DESTDIR/usr/bin/cc\"" - ] -} - @@ -4,7 +4,7 @@ "configure-commands": [ "sed -i 's@\\./fixinc\\.sh@-c true@' gcc/Makefile.in", "mkdir o", - "cd o && ../configure --prefix=/usr --enable-clocale=gnu --disable-shared --enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch --disable-multilib --disable-libgomp --without-ppl --without-cloog" + "cd o && ../configure --prefix=/usr --enable-clocale=gnu --enable-shared --enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch --disable-multilib --disable-libgomp --without-ppl --without-cloog" ], "build-commands": [ "cd o && make" |