[rtems-libbsd commit] Makefile: Do not fail if FreeBSD CPU directory does not exist.

Joel Sherrill joel at rtems.org
Fri Jul 13 13:54:56 UTC 2012


Module:    rtems-libbsd
Branch:    master
Commit:    14b4d25d8ec6b038ba72784c1ccc75e4bca91fdd
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=14b4d25d8ec6b038ba72784c1ccc75e4bca91fdd

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Fri Jul 13 08:58:33 2012 -0500

Makefile: Do not fail if FreeBSD CPU directory does not exist.

---

 Makefile            |    2 +-
 freebsd-to-rtems.py |   10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2386a6f..78fbe63 100644
--- a/Makefile
+++ b/Makefile
@@ -469,7 +469,7 @@ install: $(LIB)
 	  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
 	for i in `find freebsd -name '*.h' | $(CPU_SED)` ; do \
 	  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
-	cd freebsd/$(RTEMS_CPU)/include ; for i in `find . -name '*.h'` ; do \
+	-cd freebsd/$(RTEMS_CPU)/include && for i in `find . -name '*.h'` ; do \
 	  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
 	$(MAKE) -C freebsd-userspace install
 
diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py
index 5f074e4..f2992b6 100755
--- a/freebsd-to-rtems.py
+++ b/freebsd-to-rtems.py
@@ -388,7 +388,7 @@ class ModuleManager:
 			'\t  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
 			'\tfor i in `find freebsd -name \'*.h\' | $(CPU_SED)` ; do \\\n' \
 			'\t  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
-			'\tcd freebsd/$(RTEMS_CPU)/include ; for i in `find . -name \'*.h\'` ; do \\\n' \
+			'\t-cd freebsd/$(RTEMS_CPU)/include ; for i in `find . -name \'*.h\'` ; do \\\n' \
 			'\t  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
 			'\t$(MAKE) -C freebsd-userspace install\n' \
 			'\n' \
@@ -1228,6 +1228,14 @@ devNic.addCPUDependentHeaderFiles(
 		'i386/include/cpufunc.h',
 	]
 )
+
+devNic.addCPUDependentHeaderFiles(
+    [
+		'mips/include/cpufunc.h',
+		'mips/include/cpuregs.h',
+    ]
+)
+
 devNic.addCPUDependentSourceFiles(
 	'i386',
 	[




More information about the vc mailing list