Index: ChangeLog
2005-09-28 Geoffrey Keating <geoffk@apple.com> * Makefile.tpl (BASE_TARGET_EXPORTS): Add LIPO, STRIP. (LIPO_FOR_TARGET): New. (CONFIGURED_LIPO_FOR_TARGET): New. (USUAL_LIPO_FOR_TARGET): New. (STRIP_FOR_TARGET): New. (CONFIGURED_STRIP_FOR_TARGET): New. (USUAL_STRIP_FOR_TARGET): New. * Makefile.def (flags_to_pass): Add LIPO_FOR_TARGET and STRIP_FOR_TARGET. * configure.in: Set LIPO_FOR_TARGET, STRIP_FOR_TARGET, CONFIGURED_LIPO_FOR_TARGET, CONFIGURED_STRIP_FOR_TARGET. * Makefile.in: Regenerate. * configure.in: Regenerate. Index: gcc/ChangeLog 2005-09-28 Geoffrey Keating <geoffk@apple.com> * Makefile.in: Export LIPO_FOR_TARGET, STRIP_FOR_TARGET. (stage1-start): Delete old libgcc and libunwind before moving anything into the stage directory. (stage2-start): Likewise. (stage3-start): Likewise. (stage4-start): Likewise. (stageprofile-start): Likewise. (stagefeedback-start): Likewise. * config.gcc (*-*-darwin*): Automatically use CPU-specific darwin.h header in tm_file and CPU-specific t-darwin in tmake_file. (i[34567]86-*-darwin*): Don't change tm_file. (powerpc-*-darwin*): Don't change tm_file or tmake_file. * config/darwin.h (REAL_LIBGCC_SPEC): Rewrite to use proper libgcc shared library stub for target OS version. * config/t-slibgcc-darwin (SHLIB_SOLINK): Delete. (SHLIB_LINK): Don't make SHLIB_SOLINK. (SHLIB_INSTALL): Don't install SHLIB_SOLINK. (libgcc_s.%.dylib): New. (LIBGCC): Define. (install-darwin-libgcc-stubs): New. (INSTALL_LIBGCC): New append. * config/i386/darwin-libgcc.10.4.ver: New. * config/i386/darwin-libgcc.10.5.ver: New. * config/i386/t-darwin: New. * config/rs6000/darwin-libgcc.10.4.ver: New. * config/rs6000/darwin-libgcc.10.5.ver: New. * config/rs6000/darwin.h (REAL_LIBGCC_SPEC): Delete. * config/rs6000/t-darwin (SHLIB_VERPFX): Define.
This commit is contained in:
Geoffrey Keating
16
ChangeLog
16
ChangeLog
@@ -1,3 +1,19 @@
|
||||
2005-09-28 Geoffrey Keating <geoffk@apple.com>
|
||||
|
||||
* Makefile.tpl (BASE_TARGET_EXPORTS): Add LIPO, STRIP.
|
||||
(LIPO_FOR_TARGET): New.
|
||||
(CONFIGURED_LIPO_FOR_TARGET): New.
|
||||
(USUAL_LIPO_FOR_TARGET): New.
|
||||
(STRIP_FOR_TARGET): New.
|
||||
(CONFIGURED_STRIP_FOR_TARGET): New.
|
||||
(USUAL_STRIP_FOR_TARGET): New.
|
||||
* Makefile.def (flags_to_pass): Add LIPO_FOR_TARGET and
|
||||
STRIP_FOR_TARGET.
|
||||
* configure.in: Set LIPO_FOR_TARGET, STRIP_FOR_TARGET,
|
||||
CONFIGURED_LIPO_FOR_TARGET, CONFIGURED_STRIP_FOR_TARGET.
|
||||
* Makefile.in: Regenerate.
|
||||
* configure: Regenerate.
|
||||
|
||||
2005-09-19 David Edelsohn <edelsohn@gnu.org>
|
||||
|
||||
* configure.in (powerpc-*-aix*): Add target-libssp to noconfigdirs.
|
||||
|
||||
@@ -223,11 +223,13 @@ flags_to_pass = { flag= DLLTOOL_FOR_TARGET ; };
|
||||
flags_to_pass = { flag= GCJ_FOR_TARGET ; };
|
||||
flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; };
|
||||
flags_to_pass = { flag= LD_FOR_TARGET ; };
|
||||
flags_to_pass = { flag= LIPO_FOR_TARGET ; };
|
||||
flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; };
|
||||
flags_to_pass = { flag= LIBCFLAGS_FOR_TARGET ; };
|
||||
flags_to_pass = { flag= LIBCXXFLAGS_FOR_TARGET ; };
|
||||
flags_to_pass = { flag= NM_FOR_TARGET ; };
|
||||
flags_to_pass = { flag= RANLIB_FOR_TARGET ; };
|
||||
flags_to_pass = { flag= STRIP_FOR_TARGET ; };
|
||||
flags_to_pass = { flag= WINDRES_FOR_TARGET ; };
|
||||
|
||||
// Inter-module dependencies
|
||||
|
||||
34
Makefile.in
34
Makefile.in
@@ -192,8 +192,10 @@ BASE_TARGET_EXPORTS = \
|
||||
DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
|
||||
LD="$(LD_FOR_TARGET)"; export LD; \
|
||||
LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
|
||||
LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
|
||||
NM="$(NM_FOR_TARGET)"; export NM; \
|
||||
RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
|
||||
STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
|
||||
WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
|
||||
$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
|
||||
|
||||
@@ -478,6 +480,19 @@ USUAL_LD_FOR_TARGET = ` \
|
||||
|
||||
LDFLAGS_FOR_TARGET =
|
||||
|
||||
LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
|
||||
CONFIGURED_LIPO_FOR_TARGET=@CONFIGURED_LIPO_FOR_TARGET@
|
||||
USUAL_LIPO_FOR_TARGET = ` \
|
||||
if [ '$(host)' = '$(target)' ] ; then \
|
||||
if [ x'$(LIPO)' != x ]; then \
|
||||
echo $(LIPO); \
|
||||
else \
|
||||
echo lipo; \
|
||||
fi; \
|
||||
else \
|
||||
echo $(CONFIGURED_LIPO_FOR_TARGET) ; \
|
||||
fi`
|
||||
|
||||
NM_FOR_TARGET=@NM_FOR_TARGET@
|
||||
CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@
|
||||
USUAL_NM_FOR_TARGET = ` \
|
||||
@@ -510,6 +525,23 @@ USUAL_RANLIB_FOR_TARGET = ` \
|
||||
fi; \
|
||||
fi`
|
||||
|
||||
STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
|
||||
CONFIGURED_STRIP_FOR_TARGET=@CONFIGURED_STRIP_FOR_TARGET@
|
||||
USUAL_STRIP_FOR_TARGET = ` \
|
||||
if [ -f $$r/$(HOST_SUBDIR)/binutils/strip ] ; then \
|
||||
echo $$r/$(HOST_SUBDIR)/binutils/strip ; \
|
||||
else \
|
||||
if [ '$(host)' = '$(target)' ] ; then \
|
||||
if [ x'$(STRIP)' != x ]; then \
|
||||
echo $(STRIP); \
|
||||
else \
|
||||
echo strip; \
|
||||
fi; \
|
||||
else \
|
||||
echo $(CONFIGURED_STRIP_FOR_TARGET) ; \
|
||||
fi; \
|
||||
fi`
|
||||
|
||||
WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
|
||||
CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@
|
||||
USUAL_WINDRES_FOR_TARGET = ` \
|
||||
@@ -636,11 +668,13 @@ BASE_FLAGS_TO_PASS = \
|
||||
"GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
|
||||
"GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
|
||||
"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
|
||||
"LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
|
||||
"LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
|
||||
"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
|
||||
"LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
|
||||
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
|
||||
"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
|
||||
"STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \
|
||||
"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
|
||||
"CONFIG_SHELL=$(SHELL)" \
|
||||
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)"
|
||||
|
||||
32
Makefile.tpl
32
Makefile.tpl
@@ -195,8 +195,10 @@ BASE_TARGET_EXPORTS = \
|
||||
DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
|
||||
LD="$(LD_FOR_TARGET)"; export LD; \
|
||||
LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
|
||||
LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
|
||||
NM="$(NM_FOR_TARGET)"; export NM; \
|
||||
RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
|
||||
STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
|
||||
WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
|
||||
$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
|
||||
|
||||
@@ -481,6 +483,19 @@ USUAL_LD_FOR_TARGET = ` \
|
||||
|
||||
LDFLAGS_FOR_TARGET =
|
||||
|
||||
LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
|
||||
CONFIGURED_LIPO_FOR_TARGET=@CONFIGURED_LIPO_FOR_TARGET@
|
||||
USUAL_LIPO_FOR_TARGET = ` \
|
||||
if [ '$(host)' = '$(target)' ] ; then \
|
||||
if [ x'$(LIPO)' != x ]; then \
|
||||
echo $(LIPO); \
|
||||
else \
|
||||
echo lipo; \
|
||||
fi; \
|
||||
else \
|
||||
echo $(CONFIGURED_LIPO_FOR_TARGET) ; \
|
||||
fi`
|
||||
|
||||
NM_FOR_TARGET=@NM_FOR_TARGET@
|
||||
CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@
|
||||
USUAL_NM_FOR_TARGET = ` \
|
||||
@@ -513,6 +528,23 @@ USUAL_RANLIB_FOR_TARGET = ` \
|
||||
fi; \
|
||||
fi`
|
||||
|
||||
STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
|
||||
CONFIGURED_STRIP_FOR_TARGET=@CONFIGURED_STRIP_FOR_TARGET@
|
||||
USUAL_STRIP_FOR_TARGET = ` \
|
||||
if [ -f $$r/$(HOST_SUBDIR)/binutils/strip ] ; then \
|
||||
echo $$r/$(HOST_SUBDIR)/binutils/strip ; \
|
||||
else \
|
||||
if [ '$(host)' = '$(target)' ] ; then \
|
||||
if [ x'$(STRIP)' != x ]; then \
|
||||
echo $(STRIP); \
|
||||
else \
|
||||
echo strip; \
|
||||
fi; \
|
||||
else \
|
||||
echo $(CONFIGURED_STRIP_FOR_TARGET) ; \
|
||||
fi; \
|
||||
fi`
|
||||
|
||||
WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
|
||||
CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@
|
||||
USUAL_WINDRES_FOR_TARGET = ` \
|
||||
|
||||
176
configure
vendored
176
configure
vendored
@@ -4858,12 +4858,87 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
for ncn_progname in nm; do
|
||||
for ncn_progname in lipo; do
|
||||
if test -n "$ncn_target_tool_prefix"; then
|
||||
# Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4867: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
if test -n "$LIPO_FOR_TARGET"; then
|
||||
ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test.
|
||||
else
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_prog_LIPO_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
fi
|
||||
fi
|
||||
LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET"
|
||||
if test -n "$LIPO_FOR_TARGET"; then
|
||||
echo "$ac_t""$LIPO_FOR_TARGET" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_prog_LIPO_FOR_TARGET" && test $build = $target ; then
|
||||
# Extract the first word of "${ncn_progname}", so it can be a program name with args.
|
||||
set dummy ${ncn_progname}; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4898: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
if test -n "$LIPO_FOR_TARGET"; then
|
||||
ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test.
|
||||
else
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_prog_LIPO_FOR_TARGET="${ncn_progname}"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
fi
|
||||
fi
|
||||
LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET"
|
||||
if test -n "$LIPO_FOR_TARGET"; then
|
||||
echo "$ac_t""$LIPO_FOR_TARGET" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
fi
|
||||
test -n "$ac_cv_prog_LIPO_FOR_TARGET" && break
|
||||
done
|
||||
|
||||
if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then
|
||||
set dummy lipo
|
||||
if test $build = $target ; then
|
||||
LIPO_FOR_TARGET="$2"
|
||||
else
|
||||
LIPO_FOR_TARGET="${ncn_target_tool_prefix}$2"
|
||||
fi
|
||||
fi
|
||||
|
||||
for ncn_progname in nm; do
|
||||
if test -n "$ncn_target_tool_prefix"; then
|
||||
# Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4942: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -4894,7 +4969,7 @@ fi
|
||||
# Extract the first word of "${ncn_progname}", so it can be a program name with args.
|
||||
set dummy ${ncn_progname}; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4898: checking for $ac_word" >&5
|
||||
echo "configure:4973: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -4938,7 +5013,7 @@ fi
|
||||
# Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4942: checking for $ac_word" >&5
|
||||
echo "configure:5017: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -4969,7 +5044,7 @@ fi
|
||||
# Extract the first word of "${ncn_progname}", so it can be a program name with args.
|
||||
set dummy ${ncn_progname}; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4973: checking for $ac_word" >&5
|
||||
echo "configure:5048: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -5003,12 +5078,87 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then
|
||||
RANLIB_FOR_TARGET=":"
|
||||
fi
|
||||
|
||||
for ncn_progname in strip; do
|
||||
if test -n "$ncn_target_tool_prefix"; then
|
||||
# Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:5087: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
if test -n "$STRIP_FOR_TARGET"; then
|
||||
ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test.
|
||||
else
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_prog_STRIP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
fi
|
||||
fi
|
||||
STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET"
|
||||
if test -n "$STRIP_FOR_TARGET"; then
|
||||
echo "$ac_t""$STRIP_FOR_TARGET" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_prog_STRIP_FOR_TARGET" && test $build = $target ; then
|
||||
# Extract the first word of "${ncn_progname}", so it can be a program name with args.
|
||||
set dummy ${ncn_progname}; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:5118: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
if test -n "$STRIP_FOR_TARGET"; then
|
||||
ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test.
|
||||
else
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_prog_STRIP_FOR_TARGET="${ncn_progname}"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
fi
|
||||
fi
|
||||
STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET"
|
||||
if test -n "$STRIP_FOR_TARGET"; then
|
||||
echo "$ac_t""$STRIP_FOR_TARGET" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
fi
|
||||
test -n "$ac_cv_prog_STRIP_FOR_TARGET" && break
|
||||
done
|
||||
|
||||
if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then
|
||||
set dummy strip
|
||||
if test $build = $target ; then
|
||||
STRIP_FOR_TARGET="$2"
|
||||
else
|
||||
STRIP_FOR_TARGET="${ncn_target_tool_prefix}$2"
|
||||
fi
|
||||
fi
|
||||
|
||||
for ncn_progname in windres; do
|
||||
if test -n "$ncn_target_tool_prefix"; then
|
||||
# Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:5012: checking for $ac_word" >&5
|
||||
echo "configure:5162: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -5039,7 +5189,7 @@ fi
|
||||
# Extract the first word of "${ncn_progname}", so it can be a program name with args.
|
||||
set dummy ${ncn_progname}; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:5043: checking for $ac_word" >&5
|
||||
echo "configure:5193: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -5088,8 +5238,10 @@ CONFIGURED_GCC_FOR_TARGET="$GCC_FOR_TARGET"
|
||||
CONFIGURED_GCJ_FOR_TARGET="$GCJ_FOR_TARGET"
|
||||
CONFIGURED_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET"
|
||||
CONFIGURED_LD_FOR_TARGET="$LD_FOR_TARGET"
|
||||
CONFIGURED_LIPO_FOR_TARGET="$LIPO_FOR_TARGET"
|
||||
CONFIGURED_NM_FOR_TARGET="$NM_FOR_TARGET"
|
||||
CONFIGURED_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET"
|
||||
CONFIGURED_STRIP_FOR_TARGET="$STRIP_FOR_TARGET"
|
||||
CONFIGURED_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET"
|
||||
|
||||
|
||||
@@ -5112,8 +5264,10 @@ if test "x${build}" = "x${host}" ; then
|
||||
GCJ_FOR_TARGET="\$(USUAL_GCJ_FOR_TARGET)"
|
||||
GFORTRAN_FOR_TARGET="\$(USUAL_GFORTRAN_FOR_TARGET)"
|
||||
LD_FOR_TARGET="\$(USUAL_LD_FOR_TARGET)"
|
||||
LIPO_FOR_TARGET="\$(USUAL_LIPO_FOR_TARGET)"
|
||||
NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)"
|
||||
RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)"
|
||||
STRIP_FOR_TARGET="\$(USUAL_STRIP_FOR_TARGET)"
|
||||
WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)"
|
||||
else
|
||||
# Just use the ones we found.
|
||||
@@ -5127,8 +5281,10 @@ else
|
||||
GCJ_FOR_TARGET="\$(CONFIGURED_GCJ_FOR_TARGET)"
|
||||
GFORTRAN_FOR_TARGET="\$(CONFIGURED_GFORTRAN_FOR_TARGET)"
|
||||
LD_FOR_TARGET="\$(CONFIGURED_LD_FOR_TARGET)"
|
||||
LIPO_FOR_TARGET="\$(CONFIGURED_LIPO_FOR_TARGET)"
|
||||
NM_FOR_TARGET="\$(CONFIGURED_NM_FOR_TARGET)"
|
||||
RANLIB_FOR_TARGET="\$(CONFIGURED_RANLIB_FOR_TARGET)"
|
||||
STRIP_FOR_TARGET="\$(CONFIGURED_STRIP_FOR_TARGET)"
|
||||
WINDRES_FOR_TARGET="\$(CONFIGURED_WINDRES_FOR_TARGET)"
|
||||
fi
|
||||
|
||||
@@ -5140,7 +5296,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
|
||||
NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
|
||||
|
||||
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
|
||||
echo "configure:5144: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:5300: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
|
||||
if test "${enable_maintainer_mode+set}" = set; then
|
||||
enableval="$enable_maintainer_mode"
|
||||
@@ -5187,7 +5343,7 @@ esac
|
||||
# gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not
|
||||
# possible, however, we can resort to mv.
|
||||
echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
|
||||
echo "configure:5191: checking if symbolic links between directories work" >&5
|
||||
echo "configure:5347: checking if symbolic links between directories work" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -5463,8 +5619,10 @@ s%@GCC_FOR_TARGET@%$GCC_FOR_TARGET%g
|
||||
s%@GCJ_FOR_TARGET@%$GCJ_FOR_TARGET%g
|
||||
s%@GFORTRAN_FOR_TARGET@%$GFORTRAN_FOR_TARGET%g
|
||||
s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g
|
||||
s%@LIPO_FOR_TARGET@%$LIPO_FOR_TARGET%g
|
||||
s%@NM_FOR_TARGET@%$NM_FOR_TARGET%g
|
||||
s%@RANLIB_FOR_TARGET@%$RANLIB_FOR_TARGET%g
|
||||
s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g
|
||||
s%@WINDRES_FOR_TARGET@%$WINDRES_FOR_TARGET%g
|
||||
s%@CONFIGURED_AR_FOR_TARGET@%$CONFIGURED_AR_FOR_TARGET%g
|
||||
s%@CONFIGURED_AS_FOR_TARGET@%$CONFIGURED_AS_FOR_TARGET%g
|
||||
@@ -5475,8 +5633,10 @@ s%@CONFIGURED_GCC_FOR_TARGET@%$CONFIGURED_GCC_FOR_TARGET%g
|
||||
s%@CONFIGURED_GCJ_FOR_TARGET@%$CONFIGURED_GCJ_FOR_TARGET%g
|
||||
s%@CONFIGURED_GFORTRAN_FOR_TARGET@%$CONFIGURED_GFORTRAN_FOR_TARGET%g
|
||||
s%@CONFIGURED_LD_FOR_TARGET@%$CONFIGURED_LD_FOR_TARGET%g
|
||||
s%@CONFIGURED_LIPO_FOR_TARGET@%$CONFIGURED_LIPO_FOR_TARGET%g
|
||||
s%@CONFIGURED_NM_FOR_TARGET@%$CONFIGURED_NM_FOR_TARGET%g
|
||||
s%@CONFIGURED_RANLIB_FOR_TARGET@%$CONFIGURED_RANLIB_FOR_TARGET%g
|
||||
s%@CONFIGURED_STRIP_FOR_TARGET@%$CONFIGURED_STRIP_FOR_TARGET%g
|
||||
s%@CONFIGURED_WINDRES_FOR_TARGET@%$CONFIGURED_WINDRES_FOR_TARGET%g
|
||||
s%@FLAGS_FOR_TARGET@%$FLAGS_FOR_TARGET%g
|
||||
s%@RAW_CXX_FOR_TARGET@%$RAW_CXX_FOR_TARGET%g
|
||||
|
||||
10
configure.in
10
configure.in
@@ -2116,8 +2116,10 @@ NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(LD_FOR_TARGET, ld)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(LIPO_FOR_TARGET, lipo)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(NM_FOR_TARGET, nm)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(RANLIB_FOR_TARGET, ranlib, :)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(STRIP_FOR_TARGET, strip)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(WINDRES_FOR_TARGET, windres)
|
||||
|
||||
CONFIGURED_AR_FOR_TARGET="$AR_FOR_TARGET"
|
||||
@@ -2129,8 +2131,10 @@ CONFIGURED_GCC_FOR_TARGET="$GCC_FOR_TARGET"
|
||||
CONFIGURED_GCJ_FOR_TARGET="$GCJ_FOR_TARGET"
|
||||
CONFIGURED_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET"
|
||||
CONFIGURED_LD_FOR_TARGET="$LD_FOR_TARGET"
|
||||
CONFIGURED_LIPO_FOR_TARGET="$LIPO_FOR_TARGET"
|
||||
CONFIGURED_NM_FOR_TARGET="$NM_FOR_TARGET"
|
||||
CONFIGURED_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET"
|
||||
CONFIGURED_STRIP_FOR_TARGET="$STRIP_FOR_TARGET"
|
||||
CONFIGURED_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET"
|
||||
|
||||
AC_SUBST(CONFIGURED_AR_FOR_TARGET)dnl
|
||||
@@ -2142,8 +2146,10 @@ AC_SUBST(CONFIGURED_GCC_FOR_TARGET)dnl
|
||||
AC_SUBST(CONFIGURED_GCJ_FOR_TARGET)dnl
|
||||
AC_SUBST(CONFIGURED_GFORTRAN_FOR_TARGET)dnl
|
||||
AC_SUBST(CONFIGURED_LD_FOR_TARGET)dnl
|
||||
AC_SUBST(CONFIGURED_LIPO_FOR_TARGET)dnl
|
||||
AC_SUBST(CONFIGURED_NM_FOR_TARGET)dnl
|
||||
AC_SUBST(CONFIGURED_RANLIB_FOR_TARGET)dnl
|
||||
AC_SUBST(CONFIGURED_STRIP_FOR_TARGET)dnl
|
||||
AC_SUBST(CONFIGURED_WINDRES_FOR_TARGET)dnl
|
||||
AC_SUBST(FLAGS_FOR_TARGET)
|
||||
|
||||
@@ -2165,8 +2171,10 @@ if test "x${build}" = "x${host}" ; then
|
||||
GCJ_FOR_TARGET="\$(USUAL_GCJ_FOR_TARGET)"
|
||||
GFORTRAN_FOR_TARGET="\$(USUAL_GFORTRAN_FOR_TARGET)"
|
||||
LD_FOR_TARGET="\$(USUAL_LD_FOR_TARGET)"
|
||||
LIPO_FOR_TARGET="\$(USUAL_LIPO_FOR_TARGET)"
|
||||
NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)"
|
||||
RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)"
|
||||
STRIP_FOR_TARGET="\$(USUAL_STRIP_FOR_TARGET)"
|
||||
WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)"
|
||||
else
|
||||
# Just use the ones we found.
|
||||
@@ -2180,8 +2188,10 @@ else
|
||||
GCJ_FOR_TARGET="\$(CONFIGURED_GCJ_FOR_TARGET)"
|
||||
GFORTRAN_FOR_TARGET="\$(CONFIGURED_GFORTRAN_FOR_TARGET)"
|
||||
LD_FOR_TARGET="\$(CONFIGURED_LD_FOR_TARGET)"
|
||||
LIPO_FOR_TARGET="\$(CONFIGURED_LIPO_FOR_TARGET)"
|
||||
NM_FOR_TARGET="\$(CONFIGURED_NM_FOR_TARGET)"
|
||||
RANLIB_FOR_TARGET="\$(CONFIGURED_RANLIB_FOR_TARGET)"
|
||||
STRIP_FOR_TARGET="\$(CONFIGURED_STRIP_FOR_TARGET)"
|
||||
WINDRES_FOR_TARGET="\$(CONFIGURED_WINDRES_FOR_TARGET)"
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user