diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-08-23 09:57:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-08-23 09:57:55 +0200 |
| commit | 5b0c3cb80d1e16346f42165230496336e6d06de9 (patch) | |
| tree | c2590a2e0e69b068e705dbc96f24a9e01f93a4e4 /arch/sandbox | |
| parent | 33f8161a72e2dd4911b60cb0eaee5f1a3a1bd0f3 (diff) | |
| parent | 411e9ba6e803a35feb35ed2544e0cdf555161d65 (diff) | |
| download | barebox-5b0c3cb80d1e16346f42165230496336e6d06de9.tar.gz barebox-5b0c3cb80d1e16346f42165230496336e6d06de9.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/sandbox')
| -rw-r--r-- | arch/sandbox/Makefile | 4 | ||||
| -rw-r--r-- | arch/sandbox/os/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index 04fb7a1f1d..c2906c0b1c 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -43,11 +43,11 @@ archprepare: maketools PHONY += maketools ifeq ($(CONFIG_SDL),y) -SDL_LIBS := $(shell pkg-config sdl2 --libs) +SDL_LIBS := $(shell $(PKG_CONFIG) sdl2 --libs) endif ifeq ($(CONFIG_GPIO_LIBFTDI1),y) -FTDI1_LIBS := $(shell pkg-config libftdi1 --libs) +FTDI1_LIBS := $(shell $(PKG_CONFIG) libftdi1 --libs) endif ifeq ($(CONFIG_ASAN),y) diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile index ebcbe5833b..055ce1a316 100644 --- a/arch/sandbox/os/Makefile +++ b/arch/sandbox/os/Makefile @@ -20,8 +20,8 @@ endif obj-y = common.o tap.o setjmp.o obj-$(CONFIG_MALLOC_LIBC) += libc_malloc.o -CFLAGS_sdl.o = $(shell pkg-config sdl2 --cflags) +CFLAGS_sdl.o = $(shell $(PKG_CONFIG) sdl2 --cflags) obj-$(CONFIG_SDL) += sdl.o -CFLAGS_ftdi.o = $(shell pkg-config libftdi1 --cflags) +CFLAGS_ftdi.o = $(shell $(PKG_CONFIG) libftdi1 --cflags) obj-$(CONFIG_GPIO_LIBFTDI1) += ftdi.o |