FreeCalypso > hg > fc-magnetite
changeset 172:2c61607bb3e3
build system: pass ACI version for headers to the component recipes
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Wed, 12 Oct 2016 04:43:34 +0000 |
| parents | a8efe285e7fa |
| children | bf64d785238a |
| files | components/cst components/dti configs/2092 configs/2092-pwr configs/classic configs/l1reconst scripts/mkcomp-test.sh |
| diffstat | 7 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/components/cst Tue Oct 11 07:44:31 2016 +0000 +++ b/components/cst Wed Oct 12 04:43:34 2016 +0000 @@ -18,7 +18,7 @@ # Includes CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include" -CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci" +CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci" CPPFLAGS="$CPPFLAGS -I../../$CDGINC" CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus" CPPFLAGS="$CPPFLAGS -I.."
--- a/components/dti Tue Oct 11 07:44:31 2016 +0000 +++ b/components/dti Wed Oct 12 04:43:34 2016 +0000 @@ -51,7 +51,7 @@ CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include" CPPFLAGS="$CPPFLAGS -I../../$CDGINC" CPPFLAGS="$CPPFLAGS -I$SRCDIR" -CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_dti_mng" +CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci_dti_mng" CPPFLAGS="$CPPFLAGS -I.." CPPFLAGS="$CPPFLAGS -I../config" CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
--- a/configs/2092 Tue Oct 11 07:44:31 2016 +0000 +++ b/configs/2092 Wed Oct 12 04:43:34 2016 +0000 @@ -10,7 +10,8 @@ GPF=gpf2 CDGINC=cdg211/cdginc CDGPRIM=cdg211/prim -export CONDAT GPF CDGINC CDGPRIM +ACI=aci2 +export CONDAT GPF CDGINC CDGPRIM ACI GPRS=1 MMI=2
--- a/configs/2092-pwr Tue Oct 11 07:44:31 2016 +0000 +++ b/configs/2092-pwr Wed Oct 12 04:43:34 2016 +0000 @@ -8,7 +8,8 @@ GPF=gpf2 CDGINC=cdg211/cdginc CDGPRIM=cdg211/prim -export CONDAT GPF CDGINC CDGPRIM +ACI=aci2 +export CONDAT GPF CDGINC CDGPRIM ACI GPRS=1 MMI=2
--- a/configs/classic Tue Oct 11 07:44:31 2016 +0000 +++ b/configs/classic Wed Oct 12 04:43:34 2016 +0000 @@ -7,7 +7,8 @@ GPF=gpf2 CDGINC=cdg211/cdginc CDGPRIM=cdg211/prim -export CONDAT GPF CDGINC CDGPRIM +ACI=aci2 +export CONDAT GPF CDGINC CDGPRIM ACI GPRS=1 MMI=0
--- a/configs/l1reconst Tue Oct 11 07:44:31 2016 +0000 +++ b/configs/l1reconst Wed Oct 12 04:43:34 2016 +0000 @@ -11,7 +11,8 @@ GPF=gpf2 CDGINC=cdg211/cdginc CDGPRIM=cdg211/prim -export CONDAT GPF CDGINC CDGPRIM +ACI=aci2 +export CONDAT GPF CDGINC CDGPRIM ACI GPRS=1 MMI=0
--- a/scripts/mkcomp-test.sh Tue Oct 11 07:44:31 2016 +0000 +++ b/scripts/mkcomp-test.sh Wed Oct 12 04:43:34 2016 +0000 @@ -21,12 +21,14 @@ GPF=gpf2 CDGINC=cdg211/cdginc CDGPRIM=cdg211/prim + ACI=aci2 ;; 3) CONDAT=condat3 GPF=gpf3 CDGINC=cdg3/cdginc-conservative CDGPRIM=cdg3/sap-inline + ACI=g23m-aci ;; *) echo "Error: bad TCSENV= setting" 1>&2 @@ -42,6 +44,6 @@ GPRS=1 SRVC=1 -export BUILD_DIR CDGINC CDGPRIM CONDAT GPF GPRS MMI SRVC USE_STR2IND +export ACI BUILD_DIR CDGINC CDGPRIM CONDAT GPF GPRS MMI SRVC USE_STR2IND exec scripts/mk-component.sh "$@"