From 5316bc379fc074f1996808af644d5e1b8ac7be4c Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Fri, 27 Mar 2009 19:54:05 +0000 Subject: [PATCH] Fixed some things to do with the build system (extra headers, include paths) --- Makefile.am | 2 ++ config/CompilerCommands.hs.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ea94da2..a514e79 100644 --- a/Makefile.am +++ b/Makefile.am @@ -225,6 +225,8 @@ TESTS = tocktest pkginclude_HEADERS = support/tock_support.h pkginclude_HEADERS += support/tock_support_cif.h pkginclude_HEADERS += support/tock_support_cppcsp.h +pkginclude_HEADERS += support/tock_intrinsics_arith.h +pkginclude_HEADERS += support/tock_intrinsics_float.h clean-local: rm -f obj/*.o obj/*.hi diff --git a/config/CompilerCommands.hs.in b/config/CompilerCommands.hs.in index 1dc9113..e4689e0 100644 --- a/config/CompilerCommands.hs.in +++ b/config/CompilerCommands.hs.in @@ -13,7 +13,7 @@ cCommand inp out extra = "@CC@ @TOCK_CFLAGS@ " ++ tockIncludeFlags ++ " -c -o " ++ " " ++ extra cAsmCommand :: String -> String -> String -> String -cAsmCommand inp out extra = "@CC@ @TOCK_CFLAGS@ -S -o " ++ out ++ " " ++ inp ++ +cAsmCommand inp out extra = "@CC@ @TOCK_CFLAGS@ -S " ++ tockIncludeFlags ++ " -o " ++ out ++ " " ++ inp ++ " " ++ extra cLinkCommand :: [String] -> String -> String -> String