diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-07-20 15:05:03 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-07-20 15:52:55 -0700 |
| commit | 59be3baa8dff271d48500e009622318badfc7140 (patch) | |
| tree | d7fde1af4197df9ece8ca26fb492051df2ef80f1 /tools/build | |
| parent | b44693495af8f309b8ddec4b30833085d1c2d0c4 (diff) | |
| parent | 57f1f9dd3abea322173ea75a15887ccf14bbbe51 (diff) | |
| download | linux-59be3baa8dff271d48500e009622318badfc7140.tar.gz linux-59be3baa8dff271d48500e009622318badfc7140.tar.bz2 linux-59be3baa8dff271d48500e009622318badfc7140.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/build')
| -rw-r--r-- | tools/build/feature/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index 6654b1a35ab3..f0c5de018a95 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -208,7 +208,7 @@ $(OUTPUT)test-libtraceevent.bin: $(BUILD) -ltraceevent $(OUTPUT)test-libtracefs.bin: - $(BUILD) -ltracefs + $(BUILD) $(shell $(PKG_CONFIG) --cflags libtraceevent 2>/dev/null) -ltracefs $(OUTPUT)test-libcrypto.bin: $(BUILD) -lcrypto |