Makefile.in (BUILD_SYSTEM_HEADER_DIR): New make variabe.
2017-02-20 Bernd Edlinger <bernd.edlinger@hotmail.de> * Makefile.in (BUILD_SYSTEM_HEADER_DIR): New make variabe. (LIMITS_H_TEST, if_multiarch, stmp-fixinc): Use BUILD_SYSTEM_HEADER_DIR instead of SYSTEM_HEADER_DIR. From-SVN: r245613
This commit is contained in:
parent
0e53a276bc
commit
2b754e4d90
|
@ -1,4 +1,10 @@
|
||||||
2017-02-18 Gerald Pfeifer <gerald@pfeifer.com>
|
2017-02-20 Bernd Edlinger <bernd.edlinger@hotmail.de>
|
||||||
|
|
||||||
|
* Makefile.in (BUILD_SYSTEM_HEADER_DIR): New make variabe.
|
||||||
|
(LIMITS_H_TEST, if_multiarch, stmp-fixinc): Use BUILD_SYSTEM_HEADER_DIR
|
||||||
|
instead of SYSTEM_HEADER_DIR.
|
||||||
|
|
||||||
|
2017-02-20 Gerald Pfeifer <gerald@pfeifer.com>
|
||||||
Martin Liška <mliska@suse.cz>
|
Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
* doc/invoke.texi (use-after-scope-direct-emission-threshold):
|
* doc/invoke.texi (use-after-scope-direct-emission-threshold):
|
||||||
|
|
|
@ -517,11 +517,18 @@ CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
|
||||||
# macro is also used in a double-quoted context.
|
# macro is also used in a double-quoted context.
|
||||||
SYSTEM_HEADER_DIR = `echo @SYSTEM_HEADER_DIR@ | sed -e :a -e 's,[^/]*/\.\.\/,,' -e ta`
|
SYSTEM_HEADER_DIR = `echo @SYSTEM_HEADER_DIR@ | sed -e :a -e 's,[^/]*/\.\.\/,,' -e ta`
|
||||||
|
|
||||||
|
# Path to the system headers on the build machine
|
||||||
|
ifeq ($(build),$(host))
|
||||||
|
BUILD_SYSTEM_HEADER_DIR = $(SYSTEM_HEADER_DIR)
|
||||||
|
else
|
||||||
|
BUILD_SYSTEM_HEADER_DIR = `echo $(CROSS_SYSTEM_HEADER_DIR) | sed -e :a -e 's,[^/]*/\.\.\/,,' -e ta`
|
||||||
|
endif
|
||||||
|
|
||||||
# Control whether to run fixincludes.
|
# Control whether to run fixincludes.
|
||||||
STMP_FIXINC = @STMP_FIXINC@
|
STMP_FIXINC = @STMP_FIXINC@
|
||||||
|
|
||||||
# Test to see whether <limits.h> exists in the system header files.
|
# Test to see whether <limits.h> exists in the system header files.
|
||||||
LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ]
|
LIMITS_H_TEST = [ -f $(BUILD_SYSTEM_HEADER_DIR)/limits.h ]
|
||||||
|
|
||||||
# Directory for prefix to system directories, for
|
# Directory for prefix to system directories, for
|
||||||
# each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc.
|
# each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc.
|
||||||
|
@ -572,7 +579,7 @@ ifeq ($(enable_multiarch),yes)
|
||||||
else
|
else
|
||||||
ifeq ($(enable_multiarch),auto)
|
ifeq ($(enable_multiarch),auto)
|
||||||
# SYSTEM_HEADER_DIR is makefile syntax, cannot be evaluated in configure.ac
|
# SYSTEM_HEADER_DIR is makefile syntax, cannot be evaluated in configure.ac
|
||||||
if_multiarch = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib/*/crti.o),$(1))
|
if_multiarch = $(if $(wildcard $(shell echo $(BUILD_SYSTEM_HEADER_DIR))/../../usr/lib/*/crti.o),$(1))
|
||||||
else
|
else
|
||||||
if_multiarch =
|
if_multiarch =
|
||||||
endif
|
endif
|
||||||
|
@ -2990,11 +2997,11 @@ stmp-fixinc: gsyslimits.h macro_list fixinc_list \
|
||||||
sysroot_headers_suffix=`echo $${ml} | sed -e 's/;.*$$//'`; \
|
sysroot_headers_suffix=`echo $${ml} | sed -e 's/;.*$$//'`; \
|
||||||
multi_dir=`echo $${ml} | sed -e 's/^[^;]*;//'`; \
|
multi_dir=`echo $${ml} | sed -e 's/^[^;]*;//'`; \
|
||||||
fix_dir=include-fixed$${multi_dir}; \
|
fix_dir=include-fixed$${multi_dir}; \
|
||||||
if ! $(inhibit_libc) && test ! -d ${SYSTEM_HEADER_DIR}; then \
|
if ! $(inhibit_libc) && test ! -d ${BUILD_SYSTEM_HEADER_DIR}; then \
|
||||||
echo The directory that should contain system headers does not exist: >&2 ; \
|
echo The directory that should contain system headers does not exist: >&2 ; \
|
||||||
echo " ${SYSTEM_HEADER_DIR}" >&2 ; \
|
echo " ${BUILD_SYSTEM_HEADER_DIR}" >&2 ; \
|
||||||
tooldir_sysinc=`echo "${gcc_tooldir}/sys-include" | sed -e :a -e "s,[^/]*/\.\.\/,," -e ta`; \
|
tooldir_sysinc=`echo "${gcc_tooldir}/sys-include" | sed -e :a -e "s,[^/]*/\.\.\/,," -e ta`; \
|
||||||
if test "x${SYSTEM_HEADER_DIR}" = "x$${tooldir_sysinc}"; \
|
if test "x${BUILD_SYSTEM_HEADER_DIR}" = "x$${tooldir_sysinc}"; \
|
||||||
then sleep 1; else exit 1; fi; \
|
then sleep 1; else exit 1; fi; \
|
||||||
fi; \
|
fi; \
|
||||||
$(mkinstalldirs) $${fix_dir}; \
|
$(mkinstalldirs) $${fix_dir}; \
|
||||||
|
@ -3005,7 +3012,7 @@ stmp-fixinc: gsyslimits.h macro_list fixinc_list \
|
||||||
export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
|
export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
|
||||||
cd $(build_objdir)/fixincludes && \
|
cd $(build_objdir)/fixincludes && \
|
||||||
$(SHELL) ./fixinc.sh "$${gcc_dir}/$${fix_dir}" \
|
$(SHELL) ./fixinc.sh "$${gcc_dir}/$${fix_dir}" \
|
||||||
$(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \
|
$(BUILD_SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \
|
||||||
rm -f $${fix_dir}/syslimits.h; \
|
rm -f $${fix_dir}/syslimits.h; \
|
||||||
if [ -f $${fix_dir}/limits.h ]; then \
|
if [ -f $${fix_dir}/limits.h ]; then \
|
||||||
mv $${fix_dir}/limits.h $${fix_dir}/syslimits.h; \
|
mv $${fix_dir}/limits.h $${fix_dir}/syslimits.h; \
|
||||||
|
|
Loading…
Reference in New Issue