Permalink
Browse files

Merge pull request #12638 from YaqiWang/build_fix_12637

Two build system fixes
  • Loading branch information...
permcody committed Jan 3, 2019
2 parents ffb4222 + a16f670 commit f64358c46402883cd83eaf675b9b72676ace7e82
Showing with 2 additions and 2 deletions.
  1. +1 −1 framework/app.mk
  2. +1 −1 framework/build.mk
@@ -88,7 +88,7 @@ app_unity_srcfiles := $(foreach srcsubdir,$(unity_srcsubdirs),$(call unity_uniqu
unity_srcfiles += $(app_unity_srcfiles)

# Pick up all of the additional files in the src directory since we're not unity building those
app_non_unity_srcfiles := $(filter-out %main.C, $(shell find $(non_unity_srcsubdirs) -maxdepth 1 \( -type f -o -type l \) -regex "[^\#~]*\.C"))
app_non_unity_srcfiles := $(shell find $(non_unity_srcsubdirs) -maxdepth 1 \( -type f -o -type l \) -regex "[^\#~]*\.C" $(find_excludes))

# Override srcfiles
srcfiles := $(app_unity_srcfiles) $(app_non_unity_srcfiles)
@@ -177,7 +177,7 @@ endif
%.$(obj-suffix) : %.f90
@echo "Compiling Fortran90 (in "$(METHOD)" mode) "$<"..."
@$(libmesh_LIBTOOL) --tag=FC $(LIBTOOLFLAGS) --mode=compile --quiet \
$(libmesh_F90) $(libmesh_FFLAGS) $(libmesh_INCLUDE) -c $< $(module_dir_flag) -o $@
$(libmesh_F90) $(libmesh_FFLAGS) $(app_INCLUDES) $(libmesh_INCLUDE) -c $< $(module_dir_flag) -o $@

# Add method to list of defines passed to the compiler
libmesh_CXXFLAGS += -DMETHOD=$(METHOD)

0 comments on commit f64358c

Please sign in to comment.