summaryrefslogtreecommitdiff
path: root/libsanitizer/configure
diff options
context:
space:
mode:
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-15 16:00:47 +0000
committerhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-15 16:00:47 +0000
commit8d77218ea0f9dea6c770ffa6a2aeb166fddc2fd1 (patch)
treebf476feb11427127af02fc0d5e9eb34e1b433b70 /libsanitizer/configure
parent523709e1c88b3be88728bdaa14538ae7d2d09b67 (diff)
downloadgcc-8d77218ea0f9dea6c770ffa6a2aeb166fddc2fd1.tar.gz
Properly set MULTISUBDIR and gcc_version
* configure.ac: Properly set MULTISUBDIR. * asan/Makefile.am (gcc_version): New. * interception/Makefile.am (gcc_version): Likewise. * sanitizer_common/Makefile.am (gcc_version): Likewise. * configure: Regenerated. * asan/Makefile.in: Likewise. * interception/Makefile.in: Likewise. * sanitizer_common/Makefile.in: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193534 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer/configure')
-rwxr-xr-xlibsanitizer/configure9
1 files changed, 9 insertions, 0 deletions
diff --git a/libsanitizer/configure b/libsanitizer/configure
index f42d2ac952f..9fbfccb3411 100755
--- a/libsanitizer/configure
+++ b/libsanitizer/configure
@@ -16693,6 +16693,9 @@ _EOF
mv tmp$$ $ac_file
rm vpsed$$
echo 'MULTISUBDIR =' >> $ac_file
+ ml_norecursion=yes
+ . ${multi_basedir}/config-ml.in
+ { ml_norecursion=; unset ml_norecursion;}
;;
"sanitizer_common/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
@@ -16701,6 +16704,9 @@ _EOF
mv tmp$$ $ac_file
rm vpsed$$
echo 'MULTISUBDIR =' >> $ac_file
+ ml_norecursion=yes
+ . ${multi_basedir}/config-ml.in
+ { ml_norecursion=; unset ml_norecursion;}
;;
"asan/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
@@ -16709,6 +16715,9 @@ _EOF
mv tmp$$ $ac_file
rm vpsed$$
echo 'MULTISUBDIR =' >> $ac_file
+ ml_norecursion=yes
+ . ${multi_basedir}/config-ml.in
+ { ml_norecursion=; unset ml_norecursion;}
;;
esac