diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-04 11:43:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-04 11:43:33 -0400 |
| commit | c33ede14337a3a486f9529f27907a2f964bc94e8 (patch) | |
| tree | 9ffc9fe36e3b23b24ff8788f545b683d84a523e2 | |
| parent | b99dc74253980287c826b8158327fc8f2ff03dad (diff) | |
| parent | 755396163148b50fe1afb4bdd3365e47f3ff7a42 (diff) | |
Merge tag 'acpi-4.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"This fixes an ACPICA utilities (acpidump) build regression from the
4.16 cycle by setting LD in the CFLAGS passed to the linker to $(CC)
again (Jiri Slaby)"
* tag 'acpi-4.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
tools: power/acpi, revert to LD = gcc
| -rw-r--r-- | tools/power/acpi/Makefile.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/power/acpi/Makefile.config b/tools/power/acpi/Makefile.config index 2cccbba64418..f304be71c278 100644 --- a/tools/power/acpi/Makefile.config +++ b/tools/power/acpi/Makefile.config | |||
| @@ -56,6 +56,7 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM} | |||
| 56 | # to compile vs uClibc, that can be done here as well. | 56 | # to compile vs uClibc, that can be done here as well. |
| 57 | CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- | 57 | CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- |
| 58 | CROSS_COMPILE ?= $(CROSS) | 58 | CROSS_COMPILE ?= $(CROSS) |
| 59 | LD = $(CC) | ||
| 59 | HOSTCC = gcc | 60 | HOSTCC = gcc |
| 60 | 61 | ||
| 61 | # check if compiler option is supported | 62 | # check if compiler option is supported |