ruby-changes:53305
From: nobu <ko1@a...>
Date: Sun, 4 Nov 2018 08:43:22 +0900 (JST)
Subject: [ruby-changes:53305] nobu:r65521 (trunk): Makefile.in: use CC_WRAPPER
nobu 2018-11-04 08:43:17 +0900 (Sun, 04 Nov 2018) New Revision: 65521 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65521 Log: 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. Modified files: trunk/Makefile.in trunk/configure.ac Index: Makefile.in =================================================================== --- Makefile.in (revision 65520) +++ Makefile.in (revision 65521) @@ -16,6 +16,7 @@ top_srcdir = $(srcdir) https://github.com/ruby/ruby/blob/trunk/Makefile.in#L16 hdrdir = $(srcdir)/include PLATFORM_DIR = @PLATFORM_DIR@ +CC_WRAPPER = @XCC_WRAPPER@ CC = @CC@ CPP = @CPP@ LD = @LD@ Index: configure.ac =================================================================== --- configure.ac (revision 65520) +++ configure.ac (revision 65521) @@ -3861,12 +3861,13 @@ PACKAGE=$RUBY_BASE_NAME https://github.com/ruby/ruby/blob/trunk/configure.ac#L3861 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/ *$//'`]) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/