diff --git a/samples/Makefile.incl b/samples/Makefile.incl index 42a48d580a19c77c75bf5b025294b56bfec0d5ba..412e121e08f36d9243155837c3448a5a44fe8fdf 100644 --- a/samples/Makefile.incl +++ b/samples/Makefile.incl @@ -181,8 +181,8 @@ endif #=============== LINUX SPECIFIC OPTIONS ========================= ifeq (${PLATFORM}, LINUX) CMP= -c ${CXXFLAGS} -CC= g++ -c -D${PLATFORM} -D_REENTRANT -fpic -LINK = g++ -D${PLATFORM} -fpic ${LDFLAGS} +CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic +LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS} PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib EXTRA_LINK_OPTIONS=-lc SHLIBSUFFIX=.so diff --git a/samples/runConfigure b/samples/runConfigure index 5430b7336b1d094ee2ef884638ab887a345005b6..0ff86f6e95d056fde1a9f7a79349417544755ce7 100755 --- a/samples/runConfigure +++ b/samples/runConfigure @@ -71,8 +71,8 @@ usage() echo " -p <platform> (accepts 'aix', 'linux', 'freebsd', 'solaris', 'hp-10', 'hp-11', 'openserver', 'unixware', 'os400', 'irix', 'ptx', 'tru64', 'macosx')" - echo " -c <C compiler name> (e.g. gcc, xlc or icc)" - echo " -x <C++ compiler name> (e.g. g++, xlC, or icc)" + echo " -c <C compiler name> (e.g. gcc, xlc, icc or ecc)" + echo " -x <C++ compiler name> (e.g. g++, xlC, icc or ecc)" echo " -d (specifies that you want to build debug version)" echo " -b <bitsToBuild> (accepts '64', '32')" echo " -l <extra linker options>" @@ -213,7 +213,7 @@ fi # Set the C compiler and C++ compiler environment variables # case $cppcompiler in - xlC* | xlc* | g++ | c++ | cc | CC | aCC | icc | ICC | cxx) + xlC* | xlc* | g++ | c++ | cc | CC | aCC | icc | ICC | cxx | ecc) ;; *) diff --git a/src/xercesc/runConfigure b/src/xercesc/runConfigure index 45dbb9f924c74c91c6e4a064faa3c366a7f8c672..bd7f1fda2b9558c2ffe6d1e1fe148d8b24ebbb10 100755 --- a/src/xercesc/runConfigure +++ b/src/xercesc/runConfigure @@ -82,8 +82,8 @@ usage() echo " -p <platform> (accepts 'aix', 'linux', 'freebsd', 'solaris', 'hp-10', 'hp-11', 'openserver', 'unixware', 'os400', 'irix', 'ptx', 'tru64', 'macosx')" - echo " -c <C compiler name> (e.g. gcc, cc, xlc_r, icc)" - echo " -x <C++ compiler name> (e.g. g++, CC, xlC_r, icc, c++)" + echo " -c <C compiler name> (e.g. gcc, cc, xlc_r, icc, ecc)" + echo " -x <C++ compiler name> (e.g. g++, CC, xlC_r, icc, c++, ecc)" echo " -d (specifies that you want to build debug version)" echo " -m <message loader> can be 'inmem', 'icu', 'MsgFile' or 'iconv'" @@ -564,7 +564,7 @@ export NETACCESSOR # case $cppcompiler in - xlC* | xlc* | g++ | c++ | cc | CC | aCC | icc | ICC | cxx) + xlC* | xlc* | g++ | c++ | cc | CC | aCC | icc | ICC | cxx | ecc) ;; *) diff --git a/src/xercesc/util/Compilers/Makefile.in b/src/xercesc/util/Compilers/Makefile.in index 01de4cef5b15279f0d1f1dfd81144356e42806cf..c25ae5236edaab1a9b959235cb3a1051c2d56b29 100644 --- a/src/xercesc/util/Compilers/Makefile.in +++ b/src/xercesc/util/Compilers/Makefile.in @@ -116,6 +116,9 @@ endif ifeq (${CXX},g++) CPP_OBJECTS = GCCDefs.$(TO) endif +ifeq (${CXX},ecc) + CPP_OBJECTS = GCCDefs.$(TO) +endif ifeq (${CXX},aCC) CPP_OBJECTS = HPCCDefs.$(TO) endif diff --git a/tests/Makefile.incl b/tests/Makefile.incl index 353003cd4c7fd079bb76685c9f49775e5cabc6ba..453a91d49f3938389e19140f66d5cea3fd72862d 100644 --- a/tests/Makefile.incl +++ b/tests/Makefile.incl @@ -171,8 +171,8 @@ endif #=============== LINUX SPECIFIC OPTIONS ========================= ifeq (${PLATFORM}, LINUX) CMP= -c ${CXXFLAGS} -CC= g++ -c -D${PLATFORM} -D_REENTRANT -fpic -LINK = g++ -D${PLATFORM} -fpic ${LDFLAGS} +CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic +LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS} PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS} SHLIBSUFFIX=.so diff --git a/tests/runConfigure b/tests/runConfigure index 4a7a542ef2c21895827451ca28de689e4b0eebd6..6bfb748a4e0fc051d597d4099d1803191c741295 100755 --- a/tests/runConfigure +++ b/tests/runConfigure @@ -70,8 +70,8 @@ usage() echo " where options may be any of the following:" echo " -p <platform> (accepts 'aix', 'unixware', 'linux', 'freebsd', 'solaris', 'hp-10', 'hp-11', 'os400', 'irix', 'ptx', 'tru64', 'macosx')" - echo " -c <C compiler name> (e.g. gcc, xlc or icc)" - echo " -x <C++ compiler name> (e.g. g++, xlC, or icc)" + echo " -c <C compiler name> (e.g. gcc, xlc, icc or ecc)" + echo " -x <C++ compiler name> (e.g. g++, xlC, icc or ecc)" echo " -d (specifies that you want to build debug version)" echo " -r <thread option> can be 'pthread' or 'dce' (only used on aix, HP-11 and solaris) or 'sproc' (only on IRIX) or 'none'" echo " -b <bitsToBuild> (accepts '64', '32')" @@ -366,7 +366,7 @@ export BITSTOBUILD # Set the C compiler and C++ compiler environment variables # case $cppcompiler in - xlC* | xlc* | g++ | c++ | cc | CC | aCC | icc | ICC | cxx) + xlC* | xlc* | g++ | c++ | cc | CC | aCC | icc | ICC | cxx | ecc) ;; *)