Skip to content

Commit

Permalink
Don't use empty dependencies...
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19637 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Mar 19, 2014
1 parent 4a990f9 commit 61b63ab
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Compiler/boot/Makefile.common
Expand Up @@ -4,7 +4,7 @@ all:
else
all:
$(MAKE) --no-print-directory generate-files-in-steps
$(MAKE) --no-print-directory install
$(MAKE) --no-print-directory install INCLUDESOURCES=1
endif

generate-files-in-steps:
Expand All @@ -21,13 +21,13 @@ GEN_DIR=build/
bootstrap-from-tarball:
$(MAKE) clean
tar xJf bootstrap-sources.tar.xz
$(MAKE) install
$(MAKE) install INCLUDESOURCES=1
$(MAKE) clean
$(MAKE) generate-files-in-steps
$(MAKE) install
$(MAKE) install INCLUDESOURCES=1
$(MAKE) clean
$(MAKE) generate-files-in-steps
$(MAKE) install
$(MAKE) install INCLUDESOURCES=1

bootstrap-from-compiled: make-separate

Expand Down Expand Up @@ -92,6 +92,7 @@ $(GEN_DIR)_main.c:
$(OMC) GenerateEntryPoint.mos

$(GEN_DIR)libOpenModelicaCompiler$(SHREXT): $(ALL_OBJECTS) $(OMHOME)/lib/omc/libomcruntime.a $(OMHOME)/lib/omc/libomparse.a
@test ! -z "`echo $(ALL_OBJECTS)`" || (echo Empty dependencies for $@ ; false)
$(CC) -shared $(RPATH) $(INSTALL_NAME) -o $@ $^ $(LDFLAGS)

ifeq ($(STATIC),)
Expand All @@ -105,6 +106,7 @@ install: $(GEN_DIR)omc$(EXE_EXT) $(GEN_DIR)libOpenModelicaCompiler$(SHREXT)
else

$(GEN_DIR)omc$(EXE_EXT): $(ALL_OBJECTS) $(GEN_DIR)_main.o $(OMHOME)/lib/omc/libomcruntime.a $(OMHOME)/lib/omc/libomparse.a
@test ! -z "`echo $(ALL_OBJECTS)`" || (echo Empty dependencies for $@ ; false)
$(CC) $(GEN_DIR)_main.o $(RPATH) $(CFLAGS) $(CPPFLAGS) -o $@ $(ALL_OBJECTS) $(LDFLAGS)
install: $(GEN_DIR)omc$(EXE_EXT)
cp -a $(GEN_DIR)omc$(EXE_EXT) $(OMHOME)/bin/
Expand Down

0 comments on commit 61b63ab

Please sign in to comment.