aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/configure
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2012-11-15 16:00:47 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2012-11-15 08:00:47 -0800
commitf64bcb29f5f44c2d8d4ec722dcd9df6c9c235968 (patch)
treebf476feb11427127af02fc0d5e9eb34e1b433b70 /libsanitizer/configure
parent671e554d87635473d6bc7afd72c9108d49fed404 (diff)
downloadgcc-f64bcb29f5f44c2d8d4ec722dcd9df6c9c235968.zip
gcc-f64bcb29f5f44c2d8d4ec722dcd9df6c9c235968.tar.gz
gcc-f64bcb29f5f44c2d8d4ec722dcd9df6c9c235968.tar.bz2
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. From-SVN: r193534
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 f42d2ac..9fbfccb 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