mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
configure.ac: prepend the wrapper after CPP is set
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
0d95805c2e
commit
c61adf51a3
1 changed files with 15 additions and 12 deletions
27
configure.ac
27
configure.ac
|
@ -211,18 +211,6 @@ AS_CASE(["$build_os"],
|
|||
[xcc|x/usr/bin/cc], [: ${CXX=c++}],
|
||||
[xicc], [: ${CXX=icpc}],
|
||||
[xclang|x/usr/bin/clang], [: ${CXX=clang++}])
|
||||
|
||||
# Xcode linker warns for deprecated architecture and wrongly
|
||||
# installed TBD files.
|
||||
CC_WRAPPER=""
|
||||
AS_IF([! $CC -E -xc - <<SRC >/dev/null 2>&1], [
|
||||
@%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ >= 10
|
||||
@%:@error ignore linker warnings
|
||||
@%:@endif
|
||||
SRC
|
||||
CC_WRAPPER=`PWD=; cd "$srcdir/tool" && pwd`/darwin-cc
|
||||
CC="$CC_WRAPPER $CC"
|
||||
])
|
||||
])
|
||||
test -z "$CXX" || ac_cv_prog_CXX="$CXX"
|
||||
|
||||
|
@ -260,6 +248,21 @@ AC_SUBST(OUTFLAG)
|
|||
AC_SUBST(COUTFLAG)
|
||||
AC_SUBST(CSRCFLAG)
|
||||
|
||||
AS_CASE(["$build_os"],
|
||||
[darwin1*.*], [
|
||||
# Xcode linker warns for deprecated architecture and wrongly
|
||||
# installed TBD files.
|
||||
CC_WRAPPER=""
|
||||
AS_IF([! $CC -E -xc - <<SRC >/dev/null 2>&1], [
|
||||
@%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ >= 10
|
||||
@%:@error ignore linker warnings
|
||||
@%:@endif
|
||||
SRC
|
||||
CC_WRAPPER=`PWD=; cd "$srcdir/tool" && pwd`/darwin-cc
|
||||
CC="$CC_WRAPPER $CC"
|
||||
])
|
||||
])
|
||||
|
||||
cc_version=
|
||||
for option in --version -v -V -qversion; do
|
||||
cc_version_message=`$CC $option 2>&1`
|
||||
|
|
Loading…
Add table
Reference in a new issue