Add -dynamic for integration and stress tests with Cray compiler wrappers
Cray systems come with compiler wrappers to simplify building parallel applications. CC is the C++ wrapper, and cc is the C wrapper. The wrappers call the base {Cray, Intel, PGI, or GNU} compiler with vendor specific flags. The "Programming Environment" (prgenv) that's currently loaded determines the base compiler. e.g. compiling with gnu looks something like: module load PrgEnv-gnu cc hello.c On most systems the wrappers defaults to `-static` mode, which causes them to only look for static libraries, and not for any dynamic ones (even if the dynamic version was explicitly listed.) The integration and stress tests expect to be using the .so, so we have to run the with -dynamic so that wrapper will find/use the .so.
This commit is contained in:
parent
2ea7742e6f
commit
ccd6416073
@ -56,6 +56,7 @@ SOREV = @SOREV@
|
|||||||
PIC_CFLAGS = @PIC_CFLAGS@
|
PIC_CFLAGS = @PIC_CFLAGS@
|
||||||
CTARGET = @CTARGET@
|
CTARGET = @CTARGET@
|
||||||
LDTARGET = @LDTARGET@
|
LDTARGET = @LDTARGET@
|
||||||
|
TEST_LD_MODE = @TEST_LD_MODE@
|
||||||
MKLIB = @MKLIB@
|
MKLIB = @MKLIB@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
ARFLAGS = @ARFLAGS@
|
ARFLAGS = @ARFLAGS@
|
||||||
@ -293,11 +294,11 @@ $(objroot)test/unit/%$(EXE): $(objroot)test/unit/%.$(O) $(TESTS_UNIT_LINK_OBJS)
|
|||||||
|
|
||||||
$(objroot)test/integration/%$(EXE): $(objroot)test/integration/%.$(O) $(C_TESTLIB_INTEGRATION_OBJS) $(C_UTIL_INTEGRATION_OBJS) $(objroot)lib/$(LIBJEMALLOC).$(IMPORTLIB)
|
$(objroot)test/integration/%$(EXE): $(objroot)test/integration/%.$(O) $(C_TESTLIB_INTEGRATION_OBJS) $(C_UTIL_INTEGRATION_OBJS) $(objroot)lib/$(LIBJEMALLOC).$(IMPORTLIB)
|
||||||
@mkdir -p $(@D)
|
@mkdir -p $(@D)
|
||||||
$(CC) $(LDTARGET) $(filter %.$(O),$^) $(call RPATH,$(objroot)lib) $(objroot)lib/$(LIBJEMALLOC).$(IMPORTLIB) $(LDFLAGS) $(filter-out -lm,$(filter -lpthread,$(LIBS))) -lm $(EXTRA_LDFLAGS)
|
$(CC) $(TEST_LD_MODE) $(LDTARGET) $(filter %.$(O),$^) $(call RPATH,$(objroot)lib) $(objroot)lib/$(LIBJEMALLOC).$(IMPORTLIB) $(LDFLAGS) $(filter-out -lm,$(filter -lpthread,$(LIBS))) -lm $(EXTRA_LDFLAGS)
|
||||||
|
|
||||||
$(objroot)test/stress/%$(EXE): $(objroot)test/stress/%.$(O) $(C_JET_OBJS) $(C_TESTLIB_STRESS_OBJS) $(objroot)lib/$(LIBJEMALLOC).$(IMPORTLIB)
|
$(objroot)test/stress/%$(EXE): $(objroot)test/stress/%.$(O) $(C_JET_OBJS) $(C_TESTLIB_STRESS_OBJS) $(objroot)lib/$(LIBJEMALLOC).$(IMPORTLIB)
|
||||||
@mkdir -p $(@D)
|
@mkdir -p $(@D)
|
||||||
$(CC) $(LDTARGET) $(filter %.$(O),$^) $(call RPATH,$(objroot)lib) $(objroot)lib/$(LIBJEMALLOC).$(IMPORTLIB) $(LDFLAGS) $(filter-out -lm,$(LIBS)) -lm $(EXTRA_LDFLAGS)
|
$(CC) $(TEST_LD_MODE) $(LDTARGET) $(filter %.$(O),$^) $(call RPATH,$(objroot)lib) $(objroot)lib/$(LIBJEMALLOC).$(IMPORTLIB) $(LDFLAGS) $(filter-out -lm,$(LIBS)) -lm $(EXTRA_LDFLAGS)
|
||||||
|
|
||||||
build_lib_shared: $(DSOS)
|
build_lib_shared: $(DSOS)
|
||||||
build_lib_static: $(STATIC_LIBS)
|
build_lib_static: $(STATIC_LIBS)
|
||||||
|
18
configure.ac
18
configure.ac
@ -131,6 +131,18 @@ if test "x$GCC" != "xyes" ; then
|
|||||||
[je_cv_msvc=no])])
|
[je_cv_msvc=no])])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl check if a cray prgenv wrapper compiler is being used
|
||||||
|
je_cv_cray_prgenv_wrapper=""
|
||||||
|
if test "x${PE_ENV}" != "x" ; then
|
||||||
|
case "${CC}" in
|
||||||
|
CC|cc)
|
||||||
|
je_cv_cray_prgenv_wrapper="yes"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
if test "x$CFLAGS" = "x" ; then
|
if test "x$CFLAGS" = "x" ; then
|
||||||
no_CFLAGS="yes"
|
no_CFLAGS="yes"
|
||||||
if test "x$GCC" = "xyes" ; then
|
if test "x$GCC" = "xyes" ; then
|
||||||
@ -269,11 +281,16 @@ SOREV="${so}.${rev}"
|
|||||||
PIC_CFLAGS='-fPIC -DPIC'
|
PIC_CFLAGS='-fPIC -DPIC'
|
||||||
CTARGET='-o $@'
|
CTARGET='-o $@'
|
||||||
LDTARGET='-o $@'
|
LDTARGET='-o $@'
|
||||||
|
TEST_LD_MODE=
|
||||||
EXTRA_LDFLAGS=
|
EXTRA_LDFLAGS=
|
||||||
ARFLAGS='crus'
|
ARFLAGS='crus'
|
||||||
AROUT=' $@'
|
AROUT=' $@'
|
||||||
CC_MM=1
|
CC_MM=1
|
||||||
|
|
||||||
|
if test "x$je_cv_cray_prgenv_wrapper" = "xyes" ; then
|
||||||
|
TEST_LD_MODE='-dynamic'
|
||||||
|
fi
|
||||||
|
|
||||||
AN_MAKEVAR([AR], [AC_PROG_AR])
|
AN_MAKEVAR([AR], [AC_PROG_AR])
|
||||||
AN_PROGRAM([ar], [AC_PROG_AR])
|
AN_PROGRAM([ar], [AC_PROG_AR])
|
||||||
AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
|
AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
|
||||||
@ -432,6 +449,7 @@ AC_SUBST([SOREV])
|
|||||||
AC_SUBST([PIC_CFLAGS])
|
AC_SUBST([PIC_CFLAGS])
|
||||||
AC_SUBST([CTARGET])
|
AC_SUBST([CTARGET])
|
||||||
AC_SUBST([LDTARGET])
|
AC_SUBST([LDTARGET])
|
||||||
|
AC_SUBST([TEST_LD_MODE])
|
||||||
AC_SUBST([MKLIB])
|
AC_SUBST([MKLIB])
|
||||||
AC_SUBST([ARFLAGS])
|
AC_SUBST([ARFLAGS])
|
||||||
AC_SUBST([AROUT])
|
AC_SUBST([AROUT])
|
||||||
|
Loading…
Reference in New Issue
Block a user