diff options
author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-07-03 14:16:59 +0000 |
---|---|---|
committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-07-03 14:16:59 +0000 |
commit | d6400eba92de40931700f584568be9f72d258911 (patch) | |
tree | cf24b692c1a3b4105d4d0c2d499b906f348c37cd /configure.ac | |
parent | 844ebb30e8bbff9225c4dc3e728cfa30e6e514b7 (diff) | |
download | gcc-d6400eba92de40931700f584568be9f72d258911.tar.gz |
* configure.ac: Set srcdir when sourcing config-lang.in fragments.
* configure: Rebuilt.
gcc/objcp/
* config-lang.in: Source cp/config-lang.in, sort objc++ gtfiles list.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249922 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 0cf052b2c75..24645d88cf9 100644 --- a/configure.ac +++ b/configure.ac @@ -1839,7 +1839,12 @@ if test -d ${srcdir}/gcc; then language= lang_requires= lang_requires_boot_languages= - . ${lang_frag} + # set srcdir during sourcing lang_frag to the gcc dir. + # Sadly overriding srcdir on the . line doesn't work in plain sh as it + # polutes this shell + saved_srcdir=${srcdir} + srcdir=${srcdir}/gcc . ${lang_frag} + srcdir=${saved_srcdir} for other in ${lang_requires} ${lang_requires_boot_languages}; do case ,${enable_languages}, in *,$other,*) ;; @@ -1914,7 +1919,10 @@ if test -d ${srcdir}/gcc; then subdir_requires= boot_language=no build_by_default=yes - . ${lang_frag} + # set srcdir during sourcing. See above about save & restore + saved_srcdir=${srcdir} + srcdir=${srcdir}/gcc . ${lang_frag} + srcdir=${saved_srcdir} if test x${language} = x; then echo "${lang_frag} doesn't set \$language." 1>&2 exit 1 |