Skip to content

Include file fix, bash path fix, and fixed hardcoded make command (GIT8266O-890) #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zmetzing wants to merge 2 commits into
base: release/v3.4
Choose a base branch
from
Open

Include file fix, bash path fix, and fixed hardcoded make command (GIT8266O-890) #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d7690a
Include file fix, bash path fix, and fixed hardcoded make command
zmetzing Dec 23, 2025
e71f7c8
More portable way of finding bash. Works on both Ubuntu 24 and FreeBS…
zmetzing Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/cmake/kconfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function(__kconfig_init)
CONFIGURE_COMMAND ""
BINARY_DIR "kconfig_bin"
BUILD_COMMAND rm -f ${src_path}/zconf.lex.c ${src_path}/zconf.hash.c
COMMAND make -f ${src_path}/Makefile mconf-idf
COMMAND $(MAKE) -f ${src_path}/Makefile mconf-idf
BUILD_BYPRODUCTS ${MCONF}
INSTALL_COMMAND ""
EXCLUDE_FROM_ALL 1
Expand Down
2 changes: 1 addition & 1 deletion tools/kconfig/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ check-lxdialog := $(SRCDIR)/lxdialog/check-lxdialog.sh
CFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
-DLOCALE -MMD -MP

CFLAGS += -I "." -I "${SRCDIR}"
CFLAGS += -I "/usr/local/include" -I "." -I "${SRCDIR}"

%.o: $(SRCDIR)/%.c
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
Expand Down
2 changes: 1 addition & 1 deletion tools/kconfig/lxdialog/check-lxdialog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# Check ncurses compatibility

# What library to link
Expand Down