diff options
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | lib/mkmf.rb | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/configure.in b/configure.in index c916cd5834..ba5273a082 100644 --- a/configure.in +++ b/configure.in @@ -1214,9 +1214,11 @@ main() if test "$rb_cv_broken_crypt" = yes; then AC_DEFINE(BROKEN_CRYPT, 1) fi - if test "${RUBY_CODESIGN:+set}"; then - AC_CHECK_PROGS(codesign, codesign) - POSTLINK="$ac_cv_prog_codesign -s '$RUBY_CODESIGN' -f \$@" + AC_CHECK_PROGS(codesign, codesign) + if test -n "$codesign"; then + POSTLINK="test -z '\$(RUBY_CODESIGN)' || $codesign -s '\$(RUBY_CODESIGN)' -f \$@" + LINK_SO="$LINK_SO +$POSTLINK" fi ], [hpux*], [ LIBS="-lm $LIBS" diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 0e9d64f0d7..55e4b4a71c 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2412,13 +2412,14 @@ MESSAGE TRY_LINK = config_string('TRY_LINK') || "$(CC) #{OUTFLAG}conftest#{$EXEEXT} $(INCFLAGS) $(CPPFLAGS) " \ "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)" - LINK_SO = config_string('LINK_SO') || + LINK_SO = (config_string('LINK_SO') || "").sub(/^$/) do if CONFIG["DLEXT"] == $OBJEXT "ld $(DLDFLAGS) -r -o $@ $(OBJS)\n" else "$(LDSHARED) #{OUTFLAG}$@ $(OBJS) " \ "$(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)" end + end LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L%s' RPATHFLAG = config_string('RPATHFLAG') || '' LIBARG = config_string('LIBARG') || '-l%s' |