diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-06 14:16:17 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-06 14:16:17 +0000 |
| commit | 083b5eccf41ca73d031728be11d512c0558fa7c5 (patch) | |
| tree | 785828f00a90934ec5a6047cc1b5d169e6793f55 /contrib | |
| parent | 59d1cb458843dcfdf9ba506f83cff535e08cd802 (diff) | |
| download | gcc-083b5eccf41ca73d031728be11d512c0558fa7c5.tar.gz | |
2011-04-06 Basile Starynkevitch <basile@starynkevitch.net>
* build-melt-plugin.sh (build_melt_run_headers): Better use of
cut.
(do_melt_make): Pass -Imelt/generated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@172048 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog.MELT | 5 | ||||
| -rw-r--r-- | contrib/build-melt-plugin.sh | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/contrib/ChangeLog.MELT b/contrib/ChangeLog.MELT index ae7c3ac3b61..3f22a7c528e 100644 --- a/contrib/ChangeLog.MELT +++ b/contrib/ChangeLog.MELT @@ -1,5 +1,10 @@ 2011-04-06 Basile Starynkevitch <basile@starynkevitch.net> + * build-melt-plugin.sh (build_melt_run_headers): Better use of + cut. + (do_melt_make): Pass -Imelt/generated. + +2011-04-06 Basile Starynkevitch <basile@starynkevitch.net> * build-melt-plugin.sh (build_melt_run_headers): More verbose. 2011-04-06 Basile Starynkevitch <basile@starynkevitch.net> diff --git a/contrib/build-melt-plugin.sh b/contrib/build-melt-plugin.sh index 05691a9aeb2..dc5aadf4d1e 100644 --- a/contrib/build-melt-plugin.sh +++ b/contrib/build-melt-plugin.sh @@ -251,7 +251,7 @@ build_melt_run_headers() { melt_run_md5=`$HOSTCC -C -E -DMELT_IS_PLUGIN -I$gcc_plugin_directory/include -I. -Imelt/generated melt-run.proto.h | grep -v '^#' | md5sum | cut -c 1-32` echo "const char melt_run_preprocessed_md5[]=\"$$melt_run_md5\";" > melt-run-md5.h sed -e "s,#define *MELT_RUN_HASHMD5 *XX,#define MELT_RUN_HASHMD5 \"$$melt_run_md5\"," < melt-run.proto.h > melt-run.h - verbose_echo built melt-run.h with $(wc -c melt-run.h) bytes and md5 $melt_run_md5 + verbose_echo built melt-run.h with $(wc -c melt-run.h | cut -d ' ' -f 1) bytes and md5 $melt_run_md5 } ################ build melt.so with appropriate default settings @@ -278,9 +278,9 @@ build_melt_dot_so() { # test that the melt.so plugin is loadable without any mode... # we need the empty-file-for-melt.c verbose_echo making empty-file-for-melt.c using $GCCMELT_SOURCE_TREE/melt-make.mk - $MAKE -w -f $GCCMELT_SOURCE_TREE/melt-make.mk melt_make_move=mv empty-file-for-melt.c + $MAKE -w -f $GCCMELT_SOURCE_TREE/melt-build.mk melt_make_move=mv empty-file-for-melt.c if $GCC -fplugin=./melt.so -c -o /dev/null empty-file-for-melt.c; then - verbose_echo melt.so plugin seems to be loadable + verbose_echo melt.so plugin seems to be loadable without mode else error_echo melt.so plugin dont work exit 1 @@ -305,7 +305,7 @@ do_melt_make () { melt_make_module_dir=. \ melt_make_move=mv \ melt_installed_cflags="$HOSTMELTCFLAGS -DMELT_IS_PLUGIN -I$gcc_plugin_directory/include" \ - melt_cflags="$HOSTMELTCFLAGS -DMELT_IS_PLUGIN -I$gcc_plugin_directory/include -I$GCCMELT_SOURCE_TREE -I." \ + melt_cflags="$HOSTMELTCFLAGS -DMELT_IS_PLUGIN -I$gcc_plugin_directory/include -I$GCCMELT_SOURCE_TREE -I. -Imelt/generated" \ melt_is_plugin=1 \ VPATH=.:$GCCMELT_SOURCE_TREE/melt:$GCCMELT_SOURCE_TREE:$GCC_BUILD_TREE:$GCC_SOURCE_TREE \ $* @@ -324,7 +324,7 @@ bootstrap_melt() { verbose_echo Making warmelt-predef.melt rm -f warmelt-predef.melt if $GAWK -f $GCCMELT_SOURCE_TREE/make-warmelt-predef.awk $GCCMELT_SOURCE_TREE/melt-predef.list > warmelt-predef.melt; then - verbose_echo Generated warmelt-predef.melt with $(wc -l warmelt-predef.melt) lines + verbose_echo Generated warmelt-predef.melt with $(wc -l warmelt-predef.melt| cut -d ' ' -f 1) lines else error_echo failed to generate warmelt-predef.melt fi |