mirror of git://sourceware.org/git/glibc.git
(+cc_version): Variable and associated code removed.
(HOST_CC): Use BUILD_CC instead; all uses changed. (cross-compiling): Set to no if not the case.
This commit is contained in:
parent
b204525315
commit
2a1199db38
20
Makeconfig
20
Makeconfig
|
|
@ -234,8 +234,8 @@ endif
|
||||||
# The name of the C compiler to use for compilations of programs to run on
|
# The name of the C compiler to use for compilations of programs to run on
|
||||||
# the host that is building the library. If you set CC to a
|
# the host that is building the library. If you set CC to a
|
||||||
# cross-compiler, you must set this to the normal compiler.
|
# cross-compiler, you must set this to the normal compiler.
|
||||||
ifndef HOST_CC
|
ifndef BUILD_CC
|
||||||
HOST_CC = $(CC)
|
BUILD_CC = $(CC)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Default flags to pass the C compiler.
|
# Default flags to pass the C compiler.
|
||||||
|
|
@ -268,9 +268,6 @@ ifndef RANLIB
|
||||||
RANLIB = ranlib
|
RANLIB = ranlib
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Define non-empty if the C compiler understands -v (print version).
|
|
||||||
+cc_version = $(filter gcc,$(notdir $(firstword $(CC)))) # if using gcc
|
|
||||||
|
|
||||||
# Extra flags to pass to GCC.
|
# Extra flags to pass to GCC.
|
||||||
+gccwarn := -Wall -Wwrite-strings -Wno-parentheses
|
+gccwarn := -Wall -Wwrite-strings -Wno-parentheses
|
||||||
|
|
||||||
|
|
@ -337,13 +334,6 @@ endif # gcc
|
||||||
+cflags := $(sort $(+cflags))
|
+cflags := $(sort $(+cflags))
|
||||||
|
|
||||||
|
|
||||||
ifneq "$(findstring v,$(MAKEFLAGS))" "" # if -v
|
|
||||||
ifneq "$(strip $(+cc_version))" ""
|
|
||||||
# If Make is telling us version info, tell the compiler to do so as well.
|
|
||||||
CC := $(CC) -v
|
|
||||||
endif # +cc_version
|
|
||||||
endif # -v
|
|
||||||
|
|
||||||
# These are flags given to the C compiler to tell it to look for include
|
# These are flags given to the C compiler to tell it to look for include
|
||||||
# files (including ones given in angle brackets) in the current directory
|
# files (including ones given in angle brackets) in the current directory
|
||||||
# and in the parent library source directory.
|
# and in the parent library source directory.
|
||||||
|
|
@ -371,8 +361,10 @@ ifneq "$(filter -DHAVE_GNU_AS,$(CPPFLAGS))" ""
|
||||||
gnu-as := yes
|
gnu-as := yes
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(HOST_CC),$(CC))
|
ifneq ($(BUILD_CC),$(CC))
|
||||||
cross-compiling = yes
|
cross-compiling := yes
|
||||||
|
else
|
||||||
|
cross-compiling := no
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue