diff options
| author | Alejandro Colomar <alx@kernel.org> | 2024-02-09 22:03:58 +0100 |
|---|---|---|
| committer | Alejandro Colomar <alx@kernel.org> | 2024-02-09 22:04:30 +0100 |
| commit | 1fa873a3d2da11a524c2ddfba2c7bb3087980da0 (patch) | |
| tree | 30c3a3abaf128116e677de12c1270e6a6d0ac535 | |
| parent | 1d4f63e4f48ea2b932b1f274b1bcab6f10d1a214 (diff) | |
| download | liba2i-1fa873a3d2da11a524c2ddfba2c7bb3087980da0.tar.gz | |
share/mk/: Configure $CPP in separate file
Signed-off-by: Alejandro Colomar <alx@kernel.org>
| -rw-r--r-- | share/mk/build-deps.mk | 7 | ||||
| -rw-r--r-- | share/mk/build-obj.mk | 7 | ||||
| -rw-r--r-- | share/mk/configure-cpp.mk | 20 | ||||
| -rw-r--r-- | share/mk/lint-c.mk | 1 |
4 files changed, 26 insertions, 9 deletions
diff --git a/share/mk/build-deps.mk b/share/mk/build-deps.mk index 723e650..0c62d65 100644 --- a/share/mk/build-deps.mk +++ b/share/mk/build-deps.mk @@ -8,18 +8,13 @@ MAKEFILE_BUILD_DEPS_INCLUDED := 1 include $(MAKEFILEDIR)/build.mk include $(MAKEFILEDIR)/configure-cc.mk +include $(MAKEFILEDIR)/configure-cpp.mk include $(MAKEFILEDIR)/configure-pkgconf.mk include $(MAKEFILEDIR)/cmd.mk include $(MAKEFILEDIR)/src.mk include $(MAKEFILEDIR)/version.mk -DEFAULT_CPPFLAGS := $(shell $(PKGCONF_CMD) --cflags $(pc)) -DEFAULT_CPPFLAGS += -I$(builddir) -EXTRA_CPPFLAGS := -CPPFLAGS := $(DEFAULT_CPPFLAGS) $(EXTRA_CPPFLAGS) - - _TU_h := $(patsubst $(srcdir)/include/%,$(builddir)/%,$(TU_h)) _TU_c := $(patsubst $(srcdir)/src/%,$(builddir)/%,$(TU_c)) diff --git a/share/mk/build-obj.mk b/share/mk/build-obj.mk index b943ca9..bcbc397 100644 --- a/share/mk/build-obj.mk +++ b/share/mk/build-obj.mk @@ -9,6 +9,7 @@ MAKEFILE_BUILD_OBJ_INCLUDED := 1 include $(MAKEFILEDIR)/build.mk include $(MAKEFILEDIR)/cmd.mk include $(MAKEFILEDIR)/configure-cc.mk +include $(MAKEFILEDIR)/configure-cpp.mk include $(MAKEFILEDIR)/src.mk include $(MAKEFILEDIR)/verbose.mk include $(MAKEFILEDIR)/version.mk @@ -28,11 +29,11 @@ $(_TU_gch): %.gch: % $(MK) $(_LIB_pc_u) | %.d $$(@D)/ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< $(_TU_i): %.i: % $(MK) $(_LIB_pc_u) | %.d $$(@D)/ - $(info CC (cpp) $@) + $(info CPP $@) for opt in g 0 1 2 s 3 fast; do \ - $(CC) $(CPPFLAGS) $(CFLAGS) -O$$opt -E -o $*.O$$opt.i $<; \ + $(CPP) $(CPPFLAGS) -O$$opt -o $*.O$$opt.i $<; \ done - $(CC) $(CPPFLAGS) $(CFLAGS) -E -o $@ $< + $(CPP) $(CPPFLAGS) -o $@ $< $(_TU_s): %.s: % %.i $(MK) $(_LIB_pc_u) | %.d $$(@D)/ $(info CC $@) diff --git a/share/mk/configure-cpp.mk b/share/mk/configure-cpp.mk new file mode 100644 index 0000000..5c76000 --- /dev/null +++ b/share/mk/configure-cpp.mk @@ -0,0 +1,20 @@ +# Copyright 2022-2024 Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_CPP_INCLUDED +MAKEFILE_CONFIGURE_CPP_INCLUDED := 1 + + +include $(MAKEFILEDIR)/configure-cc.mk +include $(MAKEFILEDIR)/configure-pkgconf.mk + + +DEFAULT_CPPFLAGS := $(shell $(PKGCONF_CMD) --cflags $(pc)) +DEFAULT_CPPFLAGS += -I$(builddir) +EXTRA_CPPFLAGS := +CPPFLAGS := $(DEFAULT_CPPFLAGS) $(EXTRA_CPPFLAGS) +CPP := $(CC) $(CFLAGS) -E + + +endif # include guard diff --git a/share/mk/lint-c.mk b/share/mk/lint-c.mk index 69003c9..ec3b070 100644 --- a/share/mk/lint-c.mk +++ b/share/mk/lint-c.mk @@ -8,6 +8,7 @@ MAKEFILE_LINT_C_INCLUDED := 1 include $(MAKEFILEDIR)/build.mk include $(MAKEFILEDIR)/configure-cc.mk +include $(MAKEFILEDIR)/configure-cpp.mk include $(MAKEFILEDIR)/src.mk include $(MAKEFILEDIR)/version.mk |