summaryrefslogtreecommitdiff
path: root/Makefile.tpl
diff options
context:
space:
mode:
authortschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>2014-06-13 14:32:03 +0000
committertschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>2014-06-13 14:32:03 +0000
commitbf0001d46560bfef90b4822ebde0e0fc4caeb817 (patch)
tree5023e250d5dcca32d502346e3ce7bd41912d61bb /Makefile.tpl
parente389d60670e796d29c0c10f119c8fc2275f9b0ef (diff)
downloadgcc-bf0001d46560bfef90b4822ebde0e0fc4caeb817.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211643 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'Makefile.tpl')
-rw-r--r--Makefile.tpl19
1 files changed, 10 insertions, 9 deletions
diff --git a/Makefile.tpl b/Makefile.tpl
index 54a8dc3dd40..4822c3203bf 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