Skip to content
Snippets Groups Projects
Commit bb2e37a2 authored by Danny Auble's avatar Danny Auble
Browse files

ALPS - Only use the -ljob with salloc when running on a ALPS Cray install.

parent 3503950f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/salloc/Makefile.am
+ 2
− 0
View file @ bb2e37a2
...@@ -14,9 +14,11 @@ convenience_libs = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) ...@@ -14,9 +14,11 @@ convenience_libs = $(top_builddir)/src/api/libslurm.o $(DL_LIBS)
salloc_LDADD = \ salloc_LDADD = \
$(convenience_libs) $(convenience_libs)
if HAVE_ALPS_CRAY
if HAVE_REAL_CRAY if HAVE_REAL_CRAY
salloc_LDADD += -ljob salloc_LDADD += -ljob
endif endif
endif
salloc_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) \ salloc_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) \
$(HWLOC_LDFLAGS) $(HWLOC_LIBS) $(HWLOC_LDFLAGS) $(HWLOC_LIBS)
......
src/salloc/Makefile.in
+ 1
− 1
View file @ bb2e37a2
...@@ -55,7 +55,7 @@ build_triplet = @build@ ...@@ -55,7 +55,7 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
bin_PROGRAMS = salloc$(EXEEXT) bin_PROGRAMS = salloc$(EXEEXT)
@HAVE_REAL_CRAY_TRUE@am__append_1 = -ljob @HAVE_ALPS_CRAY_TRUE@@HAVE_REAL_CRAY_TRUE@am__append_1 = -ljob
subdir = src/salloc subdir = src/salloc
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung