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 /scripts | |
| 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 'scripts')
| -rw-r--r-- | scripts/gcc/Make-lang.in.in (renamed from scripts/gcc/Make-lang.in) | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/gcc/Make-lang.in b/scripts/gcc/Make-lang.in.in index 826f65538..cdea74be8 100644 --- a/scripts/gcc/Make-lang.in +++ b/scripts/gcc/Make-lang.in.in @@ -103,12 +103,14 @@ vhdl/default_paths.ads: Makefile echo " Compiler_Mcode : constant String := \"\";" >> tmp-dpaths.ads echo " Compiler_Llvm : constant String := \"\";" >> tmp-dpaths.ads echo " Post_Processor : constant String := \"\";" >> tmp-dpaths.ads + # Note: the @VARs@ below are replaced by ghdl's configure script + # not gcc's. echo " LibDir_Suffix : constant String :=">> tmp-dpaths.ads - echo " \"lib\";" >> tmp-dpaths.ads + echo " \"@LIBDIR_SUFFIX@\";" >> tmp-dpaths.ads echo " LibGhdlDir_Suffix : constant String :=">> tmp-dpaths.ads - echo " \"lib/ghdl\";" >> tmp-dpaths.ads + echo " \"@LIBGHDLDIR_SUFFIX@\";" >> tmp-dpaths.ads echo " IncDir_Suffix : constant String :=" >> tmp-dpaths.ads - echo " \"include/ghdl\";" >> tmp-dpaths.ads + echo " \"@INCDIR_SUFFIX@\";" >> tmp-dpaths.ads echo " Shared_Library_Extension : constant String :=">> tmp-dpaths.ads echo " \"$(VHDL_SOEXT)\";" >> tmp-dpaths.ads echo " Default_Pie : constant Boolean := False;" >> tmp-dpaths.ads |