Skip to content

Commit

Permalink
Fix cleaning of pristine repository clone.
Browse files Browse the repository at this point in the history
  - Check if the Makefile exists before issuing make clean for Ipopt.

  - Change cleaning of libffi to not even issue an error instead of
    issuing and ignoring. It makes it easier to understand and easier
    to locate other errors in the build logs.
  • Loading branch information
mahge committed Aug 11, 2021
1 parent 702aee8 commit 626b585
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions OMCompiler/Makefile.common
Expand Up @@ -170,7 +170,7 @@ ipopt:
$(CMAKE) --build $(OMC_IPOPT_ROOT)/build/ --target install

ipopt-clean:
$(CMAKE) --build $(OMC_IPOPT_ROOT)/build/ --target clean
if test -f $(OMC_IPOPT_ROOT)/build/Makefile; then $(MAKE) -C $(OMC_IPOPT_ROOT)/build/ clean; fi
rm -rf $(OMC_IPOPT_ROOT)/build

suitesparse:
Expand Down Expand Up @@ -690,7 +690,7 @@ libffi: $(LIBFFI)
$(MAKE) -C "$(LIBFFI)" install

libffi-clean:
-$(MAKE) -C "$(LIBFFI)" clean
if test -f $(LIBFFI)/Makefile; then $(MAKE) -C "$(LIBFFI)" clean; fi

sanity-check: omc
$(OMBUILDDIR)/bin/omc Examples/SanityCheck.mos
Expand Down

0 comments on commit 626b585

Please sign in to comment.