Some sanity checks for linking script

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16583 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jul 12, 2013 · 330c629 · 330c629
1 parent 2c40208
commit 330c629
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common
@@ -164,7 +164,7 @@ install: $(LIBSIMULATION) $(LIBRUNTIME) $(LIBFMIRUNTIME) simulation/libf2c/libf2
 	$(MAKE) -C util/java_interface -f $(LIBMAKEFILE) install-nomodelica
 
 clean:
-	rm -f $(ALL_PATHS_CLEAN_OBJS) *.a
+	rm -f $(ALL_PATHS_CLEAN_OBJS) fmi/*.o *.a
 	$(MAKE) -C simulation/libf2c -f ${LIBMAKEFILE} clean
 	(! test -f $(EXTERNALCBUILDDIR)/Makefile) || make -C $(EXTERNALCBUILDDIR) clean
 	(! test -f $(EXTERNALCBUILDDIR)/Makefile) || make -C $(EXTERNALCBUILDDIR) distclean
diff --git a/SimulationRuntime/c/Makefile.in b/SimulationRuntime/c/Makefile.in
@@ -9,7 +9,7 @@ builddir_bin=$(top_builddir)/build/bin
 builddir_lib=$(top_builddir)/build/lib/omc
 builddir_inc=$(top_builddir)/build/include/omc
 
-AR = sh ar.sh
+AR = sh -x ar.sh
 CC = @CC@
 CXX = @CXX@
 CONFIG_CPPFLAGS = @CPPFLAGS@

diff --git a/SimulationRuntime/c/ar.sh b/SimulationRuntime/c/ar.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/sh -x
 
-ld -r -o "$@"
-mv $1 $1.o
-ar -ru $1 $1.o
-rm $1.o
+ld -r -o "$@" || exit 1
+mv $1 $1.o || exit 1
+ar -ru $1 $1.o || exit 1
+rm $1.o || exit 1