tools/power/cpupower: fix 64bit detection when cross-compiling
When cross-compiling cpupower, 64bit detection is done with the host compiler instead of the cross-compiler and libcpupower.so.0 ends up in /usr/lib64 instead of /usr/lib for 32bit target. Fix this by moving 64bit detection after CC is defined. Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
parent
828f369d76
commit
a73f6e2fbe
tools/power/cpupower
|
@ -18,7 +18,6 @@ OUTDIR := $(shell cd $(OUTPUT) && pwd)
|
|||
$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
|
||||
endif
|
||||
|
||||
include ../../scripts/Makefile.arch
|
||||
|
||||
# --- CONFIGURATION BEGIN ---
|
||||
|
||||
|
@ -69,11 +68,6 @@ bindir ?= /usr/bin
|
|||
sbindir ?= /usr/sbin
|
||||
mandir ?= /usr/man
|
||||
includedir ?= /usr/include
|
||||
ifeq ($(IS_64_BIT), 1)
|
||||
libdir ?= /usr/lib64
|
||||
else
|
||||
libdir ?= /usr/lib
|
||||
endif
|
||||
localedir ?= /usr/share/locale
|
||||
docdir ?= /usr/share/doc/packages/cpupower
|
||||
confdir ?= /etc/
|
||||
|
@ -100,6 +94,14 @@ RANLIB = $(CROSS)ranlib
|
|||
HOSTCC = gcc
|
||||
MKDIR = mkdir
|
||||
|
||||
# 64bit library detection
|
||||
include ../../scripts/Makefile.arch
|
||||
|
||||
ifeq ($(IS_64_BIT), 1)
|
||||
libdir ?= /usr/lib64
|
||||
else
|
||||
libdir ?= /usr/lib
|
||||
endif
|
||||
|
||||
# Now we set up the build system
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue