diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-03 23:43:17 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-03 23:43:17 +0000 |
| commit | 7d9623eb242af760dc7b4f2bd93d46d3814dab36 (patch) | |
| tree | 2f2c35d41d40274b393965e12b4aac13df91f57a | |
| parent | 0f28fe2bcdc04126ea23bf92304585981adeda97 (diff) | |
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
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 73f0608544..e8debea17d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,6 +16,7 @@ top_srcdir = $(srcdir) hdrdir = $(srcdir)/include PLATFORM_DIR = @PLATFORM_DIR@ +CC_WRAPPER = @XCC_WRAPPER@ CC = @CC@ CPP = @CPP@ LD = @LD@ diff --git a/configure.ac b/configure.ac index 622850e371..aec59ae030 100644 --- a/configure.ac +++ b/configure.ac @@ -3861,12 +3861,13 @@ PACKAGE=$RUBY_BASE_NAME AC_SUBST(PACKAGE) AS_MESSAGE([$PACKAGE library version = $ruby_version]) -AS_CASE(["$build_os"], [darwin1*.*], [ - AS_IF([test x"$CC_WRAPPER" != x], [ - CC="${CC@%:@$CC_WRAPPER }" - CPP="${CPP@%:@$CC_WRAPPER }" - ]) +AS_IF([test x"$CC_WRAPPER" != x], [ + CC='$(CC_WRAPPER) '"${CC@%:@$CC_WRAPPER }" + CPP='$(CC_WRAPPER) '"${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/ *$//'`]) |