diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2014-06-13 16:32:03 +0200 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2014-06-13 16:32:03 +0200 |
| commit | b6383ab8417b0eb79fdaf8c3cf30085c1ab8d908 (patch) | |
| tree | 5023e250d5dcca32d502346e3ce7bd41912d61bb /Makefile.tpl | |
| parent | 2a7a8388e2e4b7caf08cdd67f1bcebbc49ac3133 (diff) | |
| download | gcc-b6383ab8417b0eb79fdaf8c3cf30085c1ab8d908.zip gcc-b6383ab8417b0eb79fdaf8c3cf30085c1ab8d908.tar.gz gcc-b6383ab8417b0eb79fdaf8c3cf30085c1ab8d908.tar.bz2 | |
Allow for overriding a module's srcdir.
* Makefile.tpl (configure-[+prefix+][+module+])
(configure-stage[+id+]-[+prefix+][+module+]): If specified, use
"module_srcdir" instead of "module" for locating a module's srcdir.
* Makefile.in: Regenerate.
From-SVN: r211643
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index 54a8dc3..4822c32 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1002,12 +1002,13 @@ configure-[+prefix+][+module+]: [+ IF bootstrap +][+ ELSE +] *) topdir=`echo [+subdir+]/[+module+]/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/[+module+]"; \ - libsrcdir="$$s/[+module+]"; \ + module_srcdir=[+? module_srcdir (get "module_srcdir") (get "module")+]; \ [+ IF no-config-site +]rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file [+ ENDIF +]$(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file [+ ENDIF +]$(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ [+args+] --build=${build_alias} --host=[+host_alias+] \ - --target=[+target_alias+] $${srcdiroption} [+extra_configure_flags+] \ + --target=[+target_alias+] [+extra_configure_flags+] \ || exit 1 @endif [+prefix+][+module+] @@ -1055,12 +1056,12 @@ configure-stage[+id+]-[+prefix+][+module+]: *) topdir=`echo [+subdir+]/[+module+]/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/[+module+]"; \ - libsrcdir="$$s/[+module+]"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=[+? module_srcdir (get "module_srcdir") (get "module")+]; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ [+args+] --build=${build_alias} --host=[+host_alias+] \ - --target=[+target_alias+] $${srcdiroption} [+ IF prev +]\ - --with-build-libsubdir=$(HOST_SUBDIR) [+ ENDIF prev +]\ + --target=[+target_alias+] \ + [+ IF prev +] --with-build-libsubdir=$(HOST_SUBDIR) [+ ENDIF prev +] \ $(STAGE[+id+]_CONFIGURE_FLAGS)[+ IF extra_configure_flags +] \ [+extra_configure_flags+][+ ENDIF extra_configure_flags +] @endif [+prefix+][+module+]-bootstrap |