Commit a09e5967 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Arnaldo Carvalho de Melo
Browse files

perf build: Don't fail fast path feature detection when binutils-devel is not available 



This is one more remnant of the BUILD_NONDISTRO series to make building
with binutils-devel opt-in due to license incompatibility.

In this case just the references at link time were still in place, which
make building the test-all.bin file fail, which wasn't detected before
probably because the last test was done with binutils-devel available,
doh.

Now:

  $ rpm -q binutils-devel
  package binutils-devel is not installed
  $ file /tmp/build/perf-tools/feature/test-all.bin
  /tmp/build/perf-tools/feature/test-all.bin: ELF 64-bit LSB executable, x86-64, version 1 (SYSV),
  dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2,
  BuildID[sha1]=4b5388a346b51f1b993f0b0dbd49f4570769b03c, for GNU/Linux 3.2.0, not stripped
  $

Fixes: 970ae863 ("perf build: The bfd features are opt-in, stop testing for them by default")
Reviewed-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 85c894a8

tools/build/feature/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ all: $(FILES) 
__BUILD = $(CC) $(CFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $(LDFLAGS)

  BUILD = $(__BUILD) > $(@:.bin=.make.output) 2>&1

  BUILD_BFD = $(BUILD) -DPACKAGE='"perf"' -lbfd -ldl

  BUILD_ALL = $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma -lzstd

  BUILD_ALL = $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -ldl -lz -llzma -lzstd



__BUILDXX = $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(@F)) $(LDFLAGS)

  BUILDXX = $(__BUILDXX) > $(@:.bin=.make.output) 2>&1
@@ -115,7 +115,7 @@ __BUILDXX = $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$( 
###############################



$(OUTPUT)test-all.bin:

	$(BUILD_ALL) || $(BUILD_ALL) -lopcodes -liberty

	$(BUILD_ALL)



$(OUTPUT)test-hello.bin:

	$(BUILD)

tools/perf/Makefile.config

+2 −3
Original line number Diff line number Diff line
@@ -354,9 +354,6 @@ FEATURE_CHECK_LDFLAGS-libpython := $(PYTHON_EMBED_LDOPTS) 


FEATURE_CHECK_LDFLAGS-libaio = -lrt



FEATURE_CHECK_LDFLAGS-disassembler-four-args = -lbfd -lopcodes -ldl

FEATURE_CHECK_LDFLAGS-disassembler-init-styled = -lbfd -lopcodes -ldl



CORE_CFLAGS += -fno-omit-frame-pointer

CORE_CFLAGS += -Wall

CORE_CFLAGS += -Wextra
@@ -930,6 +927,8 @@ ifdef BUILD_NONDISTRO 


  ifeq ($(feature-libbfd), 1)

    EXTLIBS += -lbfd -lopcodes

    FEATURE_CHECK_LDFLAGS-disassembler-four-args = -lbfd -lopcodes -ldl

    FEATURE_CHECK_LDFLAGS-disassembler-init-styled = -lbfd -lopcodes -ldl

  else

    # we are on a system that requires -liberty and (maybe) -lz

    # to link against -lbfd; test each case individually here