| Patrick Williams | 520786c | 2023-06-25 16:20:36 -0500 | [diff] [blame] | 1 | Upstream-Status: Pending |
| 2 | |
| Andrew Geissler | ac970dd | 2021-02-12 15:32:45 -0600 | [diff] [blame] | 3 | --- a/scripts/Kbuild.klibc |
| 4 | +++ b/scripts/Kbuild.klibc |
| 5 | @@ -113,10 +113,8 @@ KLIBCCPPFLAGS := -nostdinc -iwithpref |
| 6 | -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ |
| 7 | -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ |
| 8 | -I$(KLIBCOBJ)/../include \ |
| 9 | - -I$(KLIBCINC) |
| 10 | -ifeq ($(cc-name),clang) |
| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame] | 11 | -KLIBCCPPFLAGS += -isystem $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-file-name=include) |
| Andrew Geissler | ac970dd | 2021-02-12 15:32:45 -0600 | [diff] [blame] | 12 | -endif |
| 13 | + -I$(KLIBCINC) \ |
| 14 | + -I$(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-file-name=include) |
| 15 | |
| 16 | # kernel include paths |
| 17 | KLIBCKERNELSRC ?= $(srctree) |
| 18 | @@ -137,7 +135,7 @@ KLIBCCFLAGS += $(KLIBCCPPFLAGS) $(K |
| 19 | KLIBCAFLAGS += -D__ASSEMBLY__ $(KLIBCCFLAGS) |
| 20 | KLIBCSTRIPFLAGS += --strip-all -R .comment -R .note |
| 21 | |
| 22 | -KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) $(if $(filter gcc,$(cc-name)),--print-libgcc,--print-libgcc-file-name)) |
| 23 | +KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-libgcc-file-name) |
| 24 | KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) |
| 25 | KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o |
| 26 | KLIBCLIBC := $(KLIBCOBJ)/libc.a |