SDOCM00114110 IPC custom build failure with XDCtools core product

[ipc/ipcdev.git] / packages / ti / sdo / ipc / makefile_gccArmLto.xdt

diff --git a/packages/ti/sdo/ipc/makefile_gccArmLto.xdt b/packages/ti/sdo/ipc/makefile_gccArmLto.xdt
index 1390dec0d7dcd85f9e1821f8e17aeea49988f6b5..0181edcb3114f56f05b4435c2cb4893455e18d7f 100644 (file)
--- a/packages/ti/sdo/ipc/makefile_gccArmLto.xdt
+++ b/packages/ti/sdo/ipc/makefile_gccArmLto.xdt
@@ -1,6 +1,6 @@
 %%{
 /*
- * Copyright (c) 2013, Texas Instruments Incorporated
+ * Copyright (c) 2012-2014 Texas Instruments Incorporated - http://www.ti.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,13 +33,9 @@
 %%}
 %%{
     var File = xdc.module("xdc.services.io.File");
-
     var BIOS = xdc.module("ti.sysbios.BIOS");
-
     var Build = xdc.module("ti.sdo.ipc.Build");
-
     var TARGET = $args[0];
-
     var XDCROOT = String(environment['xdc.rootDir'] + '/packages/').replace(/\\/g, "/");
 
     var XOPTS = '-I "' + XDCROOT + '"'
@@ -61,18 +57,17 @@
 vpath % `File.getDOSPath(this.$package.packageRepository) + "ti/sdo/"`
 vpath %.c `XDCROOT`
 
-CCOPTS    = `BIOS.getCCOpts(TARGET.$name)`
+CCOPTS    = `Build.getCCOpts(TARGET.$name)`
 
 XDC_ROOT  = `XDCROOT`
 
 BUILD_DEFS = `Build.getDefs()`
 
 BIOS_INC  = -I"`xdc.getPackageRepository("ti.sysbios")`"
-
+TARGET_INC  = -I"`xdc.getPackageRepository("ti.targets")`"
 IPC_INC    = -I"`xdc.getPackageRepository("ti.sdo.ipc")`"
-
 UTILS_INC    = -I"`xdc.getPackageRepository("ti.sdo.utils")`"
-
+INCS = $(BIOS_INC) $(TARGET_INC) $(IPC_INC) $(UTILS_INC)
 
 CC = `CGEN`/`TARGET.ccBin.cmd` $(CCOPTS) -I `CGEN`/arm-none-eabi/include
 ASM = `CGEN`/`TARGET.asmBin.cmd` $(CCOPTS) -I `CGEN`/arm-none-eabi/include
@@ -96,17 +91,22 @@ endef
 
 define ASSEMBLE
        @echo asm`TARGET.suffix` $< ...
-       @$(ASM) $(BUILD_DEFS) `XOPTS` $(BIOS_INC) $<
+       @$(ASM) $(BUILD_DEFS) `XOPTS` $(INCS) $<
 endef
 
 define COMPILE
        @echo cl`TARGET.suffix` $< ...
-       @$(CC) $(BUILD_DEFS) `XOPTS` $(BIOS_INC) $(IPC_INC) $(UTILS_INC) $<
+       @$(CC) $(BUILD_DEFS) `XOPTS` $(INCS) $<
 endef
 
 %var LIB = "ipc.a" + TARGET.suffix;
 
+%if (BIOS.buildingAppLib == false) {
+all: `Build.$private.libDir``LIB`
+%}
+%else {
 all: `LIB`
+%}
 
 %var sources = Build.getAsmFiles(TARGET.$name);
 %for each (var s in sources) {
@@ -131,9 +131,12 @@ all: `LIB`
        @echo ar`TARGET.suffix` $^ ...
        @-$(call RM, $@)
        @$(AR) $@ $^
+
 %if (BIOS.buildingAppLib == false) {
+`Build.$private.libDir``LIB`: `LIB`
+       @echo cp `LIB`
        @-$(call RM, "`Build.$private.libDir``LIB`")
-       $(CP) `LIB` "`Build.$private.libDir``LIB`"
+       @$(CP) `LIB` "`Build.$private.libDir``LIB`"
 %}
 
 clean: