diff options
| -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/ *$//'`]) |