mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Makefile.in: use CC_WRAPPER
* Makefile.in (CC_WRAPPER): use the wrapper to suppress warnings by Apple's broken packages when linking in the toplevel directory. * configure.ac (CC_WRAPPER): separate from CC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
0f28fe2bcd
commit
7d9623eb24
2 changed files with 7 additions and 5 deletions
|
@ -16,6 +16,7 @@ top_srcdir = $(srcdir)
|
||||||
hdrdir = $(srcdir)/include
|
hdrdir = $(srcdir)/include
|
||||||
PLATFORM_DIR = @PLATFORM_DIR@
|
PLATFORM_DIR = @PLATFORM_DIR@
|
||||||
|
|
||||||
|
CC_WRAPPER = @XCC_WRAPPER@
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
CPP = @CPP@
|
CPP = @CPP@
|
||||||
LD = @LD@
|
LD = @LD@
|
||||||
|
|
11
configure.ac
11
configure.ac
|
@ -3861,12 +3861,13 @@ PACKAGE=$RUBY_BASE_NAME
|
||||||
AC_SUBST(PACKAGE)
|
AC_SUBST(PACKAGE)
|
||||||
AS_MESSAGE([$PACKAGE library version = $ruby_version])
|
AS_MESSAGE([$PACKAGE library version = $ruby_version])
|
||||||
|
|
||||||
AS_CASE(["$build_os"], [darwin1*.*], [
|
AS_IF([test x"$CC_WRAPPER" != x], [
|
||||||
AS_IF([test x"$CC_WRAPPER" != x], [
|
CC='$(CC_WRAPPER) '"${CC@%:@$CC_WRAPPER }"
|
||||||
CC="${CC@%:@$CC_WRAPPER }"
|
CPP='$(CC_WRAPPER) '"${CPP@%:@$CC_WRAPPER }"
|
||||||
CPP="${CPP@%:@$CC_WRAPPER }"
|
CC_WRAPPER='$(rubyarchdir)/darwin-cc'
|
||||||
])
|
XCC_WRAPPER='$(top_srcdir)/tool/darwin-cc'
|
||||||
])
|
])
|
||||||
|
AC_SUBST(XCC_WRAPPER)
|
||||||
|
|
||||||
AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/ *$//'`])
|
AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/ *$//'`])
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue