Skip to content

replace EXTRA_CFLAGS with CFLAGS_MODULE #716

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
pleasurefish wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Open

replace EXTRA_CFLAGS with CFLAGS_MODULE #716

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions scripts/kmod_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ def parse_kbuild_options(kbuild_options):
def check_kbuild_option_conflicts(kdir, option, value):
"""
Checks whether kbuild_option is already defined in the kernel config
causing conflicts by overriding them in EXTRA_CFLAGS
causing conflicts by overriding them in CFLAGS_MODULE
:return: Zero(0) if there is no conflict, one(1) otherwise
"""
message = (
"Overridden '{0}' option in EXTRA_CFLAGS. "
"Overridden '{0}' option in CFLAGS_MODULE. "
"Bob was asked to set the kernel option '{0}={1}', "
"which is already present in the kernel's config. "
"Please disable this option in the kernel "
Expand Down Expand Up @@ -98,7 +98,7 @@ def build_module(
Invoke an out of tree kernel build.
"""
# Invoke the kernel build system
cmd = [make_command, "-C", kdir, "M=" + module_dir, "EXTRA_CFLAGS=" + extra_cflags]
cmd = [make_command, "-C", kdir, "M=" + module_dir, "CFLAGS_MODULE=" + extra_cflags]
cmd.extend(make_args)

# Sanitize the environment - we should only use build options passed in via
Expand Down Expand Up @@ -258,10 +258,10 @@ def parse_args():
"--kbuild-options",
nargs="+",
default=[],
help="Kernel config options to enable, that get added to EXTRA_CFLAGS too",
help="Kernel config options to enable, that get added to CFLAGS_MODULE too",
)
group.add_argument(
"--extra-cflags", default="", help="Options to add to EXTRA_CFLAGS as a string"
"--extra-cflags", default="", help="Options to add to CFLAGS_MODULE as a string"
)
group.add_argument(
"make_args",
Expand Down Expand Up @@ -317,7 +317,7 @@ def main():
if kbuild_conflicts > 0:
sys.exit(1)

# Prepend EXTRA_CFLAGS with modified include paths
# Prepend CFLAGS_MODULE with modified include paths
includes = ["-I" + s for s in search_path]
extra_cflags = (
" ".join(includes) + " " + args.extra_cflags + " " + " ".join(kbuild_cflags)
Expand Down