Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

various build system fixes #1824

Merged
merged 7 commits into from Nov 15, 2018

build: don't use wreck/rcalc.o directly in LDADD

Create librcalc.la convenience library Instead of including
wreck/rcalc.o directly in the LDADD of executables. This should
fix problems during parallel make of the form:

 gcc: error: rcalc.o: No such file or directory

Fixes #1833
  • Loading branch information...
grondo committed Nov 13, 2018
commit cf34bb71e78413e3863732d4477c1b161318b9a7
Copy path View file
@@ -30,9 +30,15 @@ fluxlibexec_PROGRAMS = \
fluxmod_libadd = $(top_builddir)/src/common/libflux-core.la \
$(top_builddir)/src/common/libflux-internal.la

job_la_SOURCES = job.c rcalc.c rcalc.h wreck_job.c wreck_job.h
noinst_LTLIBRARIES = \
librcalc.la
librcalc_la_SOURCES = \
rcalc.c \
rcalc.h

job_la_SOURCES = job.c wreck_job.c wreck_job.h
job_la_LDFLAGS = $(AM_LDFLAGS) $(fluxmod_ldflags) -module
job_la_LIBADD = $(fluxmod_libadd)
job_la_LIBADD = $(fluxmod_libadd) librcalc.la

wrexecd_SOURCES = \
wrexecd.c \
@@ -50,7 +56,7 @@ wrexecd_LDFLAGS = \
$(AM_LDFLAGS) -export-dynamic

wrexecd_LDADD = \
rcalc.o \
librcalc.la \
$(wrexecd_libs) \
$(ZMQ_LIBS) $(LUA_LIB) $(LIBPTHREAD) $(HWLOC_LIBS)

Copy path View file
@@ -441,8 +441,8 @@ request_req_la_LIBADD = \
wreck_rcalc_SOURCES = wreck/rcalc.c
wreck_rcalc_CPPFLAGS = $(test_cppflags)
wreck_rcalc_LDADD = \
$(test_ldadd) $(LIBDL) $(LIBUTIL) \
$(top_builddir)/src/modules/wreck/rcalc.o
$(top_builddir)/src/modules/wreck/librcalc.la \
$(test_ldadd) $(LIBDL) $(LIBUTIL)

wreck_sched_dummy_la_SOURCES = wreck/sched-dummy.c
wreck_sched_dummy_la_CPPFLAGS = $(test_cppflags)
ProTip! Use n and p to navigate between commits in a pull request.
You can鈥檛 perform that action at this time.