diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-04-11 10:09:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-04-11 10:09:36 +1000 |
| commit | 4f6be05ae414aa972c18d5b0de1ae33fb7677190 (patch) | |
| tree | fd7347b3edc9da9cc72a928736787b49622acdb4 /tools/scripts | |
| parent | 2d9c3571b3c09c1515ad9dd2cb80eeec9f22af90 (diff) | |
| parent | 490fde262f17c5e4db27ee871cef970846e84599 (diff) | |
| download | linux-next-4f6be05ae414aa972c18d5b0de1ae33fb7677190.tar.gz | |
Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
# Conflicts:
# drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
Diffstat (limited to 'tools/scripts')
| -rw-r--r-- | tools/scripts/Makefile.include | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include index 0efb8f2b33ce..ff527ac065cf 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -108,6 +108,8 @@ endif # GCC_TOOLCHAIN_DIR endif # CLANG_CROSS_FLAGS CFLAGS += $(CLANG_CROSS_FLAGS) AFLAGS += $(CLANG_CROSS_FLAGS) +else +CLANG_CROSS_FLAGS := endif # CROSS_COMPILE # Hack to avoid type-punned warnings on old systems such as RHEL5: |