Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baa1973e authored by Peter Foley's avatar Peter Foley Committed by Arnaldo Carvalho de Melo
Browse files

tools build: Fix objtool build with clang 



Clang doesn't support multiple arguments being passed to -Wp, so split
them.

  Fixes this error:
  HOSTCC   tools/objtool/fixdep.o
  cat: tools/objtool/.fixdep.o.d: No such file or directory

Signed-off-by: default avatarPeter Foley <pefoley2@pefoley.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20161128024346.17371-1-pefoley2@pefoley.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1cd6472e

tools/build/Build.include

+3 −3
Original line number Original line Diff line number Diff line
@@ -89,12 +89,12 @@ if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ 
# - per target C flags

# - per target C flags

# - per object C flags

# - per object C flags

# - BUILD_STR macro to allow '-D"$(variable)"' constructs

# - BUILD_STR macro to allow '-D"$(variable)"' constructs

c_flags_1 = -Wp,-MD,$(depfile),-MT,$@ $(CFLAGS) -D"BUILD_STR(s)=\#s" $(CFLAGS_$(basetarget).o) $(CFLAGS_$(obj))

c_flags_1 = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(CFLAGS) -D"BUILD_STR(s)=\#s" $(CFLAGS_$(basetarget).o) $(CFLAGS_$(obj))

c_flags_2 = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(c_flags_1))

c_flags_2 = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(c_flags_1))

c_flags   = $(filter-out $(CFLAGS_REMOVE_$(obj)), $(c_flags_2))

c_flags   = $(filter-out $(CFLAGS_REMOVE_$(obj)), $(c_flags_2))

cxx_flags = -Wp,-MD,$(depfile),-MT,$@ $(CXXFLAGS) -D"BUILD_STR(s)=\#s" $(CXXFLAGS_$(basetarget).o) $(CXXFLAGS_$(obj))

cxx_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(CXXFLAGS) -D"BUILD_STR(s)=\#s" $(CXXFLAGS_$(basetarget).o) $(CXXFLAGS_$(obj))





###

###

## HOSTCC C flags

## HOSTCC C flags





host_c_flags = -Wp,-MD,$(depfile),-MT,$@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj))
 
host_c_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj))