diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2022-03-12 16:27:22 +0100 |
|---|---|---|
| committer | tgingold <tgingold@users.noreply.github.com> | 2022-03-13 08:58:58 +0100 |
| commit | a89bb895d87768df1c0d78d3941f8cec37593222 (patch) | |
| tree | 7d3109a68c3eb54f6abd98858e4d9ca3e285fb9f /Makefile.in | |
| parent | e59396cf31a30c7c8ba6480ea02e34bfde97e4c9 (diff) | |
| download | ghdl-a89bb895d87768df1c0d78d3941f8cec37593222.tar.gz ghdl-a89bb895d87768df1c0d78d3941f8cec37593222.tar.bz2 ghdl-a89bb895d87768df1c0d78d3941f8cec37593222.zip | |
Fix hardcoded values in gcc backend's default_paths
The gcc backend's Make-lang.in still had hardcoded install paths. Since
this is copied to the gcc build system we don't have access to our
configure variables, so just treat it as a subst_file in the configure
script.
While we're at it we get rid of the separate sed invocation for
default_paths and have that go through config.status instead.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 5ad6423f5..f99927395 100644 --- a/Makefile.in +++ b/Makefile.in @@ -166,6 +166,9 @@ Makefile: $(srcdir)/Makefile.in ./config.status setup.py: $(srcdir)/setup.py.in ./config.status ./config.status +scripts/gcc/Make-lang.in: $(srcdir)/scripts/gcc/Make-lang.in.in ./config.status + ./config.status + GHDL_COMMON_INCFLAGS=-aI$(srcdir)/src -aI$(srcdir)/src/vhdl -aI$(srcdir)/src/synth -aI$(srcdir)/src/grt -aI$(srcdir)/src/psl -aI$(srcdir)/src/vhdl/translate GRTSRCDIR=$(abs_srcdir)/src/grt @@ -240,7 +243,7 @@ all.gcc: @echo "3) $(MAKE) ghdllib" @echo "4) $(MAKE) install" -copy-sources.gcc: version.ads +copy-sources.gcc: version.ads scripts/gcc/Make-lang.in $(RM) -rf $(gcc_vhdl_dir) $(MKDIR) $(gcc_vhdl_dir) $(CP) -p version.ads ghdlsynth_maybe.ads $(gcc_vhdl_dir) @@ -282,7 +285,7 @@ copy-sources.gcc: version.ads $(CP) -p $(srcdir)/doc/ghdl.texi $(srcdir)/doc/ghdl.1 $(gcc_vhdl_dir) $(MKDIR) $(gcc_vhdl_dir)/ghdldrv $(CP) -pR $(srcdir)/src/ghdldrv/*.ad? $(gcc_vhdl_dir)/ghdldrv - $(CP) -p $(srcdir)/scripts/gcc/Make-lang.in $(gcc_vhdl_dir) + $(CP) -p scripts/gcc/Make-lang.in $(gcc_vhdl_dir) $(CP) -p $(srcdir)/scripts/gcc/config-lang.in $(gcc_vhdl_dir) $(CP) -p $(srcdir)/scripts/gcc/lang-options.h $(gcc_vhdl_dir) $(CP) -p $(srcdir)/scripts/gcc/lang-specs.h $(gcc_vhdl_dir) |