icc 10.1.009 does still not accept .so as dynamic lib extension on 10.5, make

exception to use again .dylib for icc.


git-svn-id: http://root.cern.ch/svn/root/trunk@22179 27541ba8-7e3a-0410-8455-c3a389f83636

build/unix/makelib.sh

@@ -33,7 +33,7 @@ rm -f $LIB
 
 if [ $PLATFORM = "macosx" ]; then
    macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
-   if [ $macosx_minor -ge 5 ]; then
+   if [ $macosx_minor -ge 5 ] && [ $LD != "icpc" ]; then
       soext="so"
    else
       soext="dylib"

config/Makefile.macosxicc

@@ -79,11 +79,12 @@ ifeq ($(subst $(MACOSX_MINOR),,123),123)
 SOFLAGS       = $(OPT) -dynamiclib -single_module \
                 -undefined dynamic_lookup -install_name $(LIBDIR)/
 endif
-ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
-SOEXT         = so
-else
+#ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
+# not yet supported by icc 10.1 xilibtool
+#SOEXT         = so
+#else
 SOEXT         = dylib
-endif
+#endif
 
 # System libraries:
 SYSLIBS       = -lm $(EXTRA_LDFLAGS) $(OSTHREADLIBDIR) \

test/Makefile.arch

@@ -422,6 +422,9 @@ ifeq ($(ARCH),macosxicc)
 # MacOS X with Intel icc compiler
 MACOSX_MINOR := $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2)
 MACOSXTARGET := MACOSX_DEPLOYMENT_TARGET=10.$(MACOSX_MINOR)
+ifeq ($(MACOSX_MINOR),5)
+MACOSX_MINOR := 4
+endif
 CXX           = icc
 CXXFLAGS      = $(OPT) -fPIC -wd1476
 LD            = $(MACOSXTARGET) icpc