Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
lang/gcc14-devel: Fix conflict on libgccjit.h and libgccjit++.h
Some GCC ports install libgccjit.h and libgccjit++.h in the same directory. Fix conflict for lang/gcc14-devel. See also commit 0338e04 that fixed the conflict in the same way for lang/gcc11. PR: 257060, 277383
- Loading branch information
1 parent
bb69289
commit c43b090
Showing
4 changed files
with
34 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
--- gcc/Makefile.in.orig 2024-02-25 22:32:27 UTC | ||
+++ gcc/Makefile.in | ||
@@ -671,6 +671,8 @@ libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/ | ||
|
||
# Directory in which the compiler finds libraries etc. | ||
libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) | ||
+# Directory in which the compiler finds headers. | ||
+libsubincludedir = $(libdir)/gcc/$(target_alias)/$(version)/include | ||
# Directory in which the compiler finds executables | ||
libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) | ||
# Directory in which all plugin resources are installed | ||
@@ -3821,6 +3823,7 @@ installdirs: | ||
# $(libdir)/gcc/include isn't currently searched by cpp. | ||
installdirs: | ||
$(mkinstalldirs) $(DESTDIR)$(libsubdir) | ||
+ $(mkinstalldirs) $(DESTDIR)$(libsubincludedir) | ||
$(mkinstalldirs) $(DESTDIR)$(libexecsubdir) | ||
$(mkinstalldirs) $(DESTDIR)$(bindir) | ||
$(mkinstalldirs) $(DESTDIR)$(includedir) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
--- gcc/jit/Make-lang.in.orig 2024-02-25 22:32:31 UTC | ||
+++ gcc/jit/Make-lang.in | ||
@@ -360,9 +360,9 @@ jit.install-headers: installdirs | ||
# Install hooks: | ||
jit.install-headers: installdirs | ||
$(INSTALL_DATA) $(srcdir)/jit/libgccjit.h \ | ||
- $(DESTDIR)$(includedir)/libgccjit.h | ||
+ $(DESTDIR)$(libsubincludedir)/libgccjit.h | ||
$(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \ | ||
- $(DESTDIR)$(includedir)/libgccjit++.h | ||
+ $(DESTDIR)$(libsubincludedir)/libgccjit++.h | ||
|
||
ifneq (,$(findstring mingw,$(target))) | ||
jit.install-common: installdirs jit.install-headers |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters