summaryrefslogtreecommitdiffstats
path: root/src/occ_405/img_defs.mk
diff options
context:
space:
mode:
authorWilliam Bryan <wilbryan@us.ibm.com>2016-10-20 13:53:03 -0500
committerWilliam A. Bryan <wilbryan@us.ibm.com>2016-10-24 11:25:55 -0400
commita4e04571d60b58c0c778c870bc215bf467085fb6 (patch)
treecff81d38b342965bcfb90b509cd1591a194bfdf2 /src/occ_405/img_defs.mk
parentf5f808eb2918e96bcdf324bd2dd90853bf9b5f3c (diff)
downloadtalos-occ-a4e04571d60b58c0c778c870bc215bf467085fb6.tar.gz
talos-occ-a4e04571d60b58c0c778c870bc215bf467085fb6.zip
Changes for GCC 4.9 and OP
Change-Id: I95ddff4b290fcf3eab617a674afc489698c78a1e Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31563 Reviewed-by: Martha Broyles <mbroyles@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Diffstat (limited to 'src/occ_405/img_defs.mk')
-rw-r--r--src/occ_405/img_defs.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/occ_405/img_defs.mk b/src/occ_405/img_defs.mk
index 45ab35d..2e3a4f3 100644
--- a/src/occ_405/img_defs.mk
+++ b/src/occ_405/img_defs.mk
@@ -110,8 +110,12 @@ export SSXLIB_SRCDIR = $(abspath ../lib/ssxlib)
endif
ifndef GCC-TOOL-PREFIX
+ifdef CROSS_PREFIX
+GCC-TOOL-PREFIX = $(CROSS_PREFIX)
+else
GCC-TOOL-PREFIX = $(CTEPATH)/tools/ppcgcc/prod/bin/powerpc-linux-
endif
+endif
ifndef PPETRACEPP_DIR
export PPETRACEPP_DIR = $(abspath ../ppe/tools/ppetracepp)
@@ -122,12 +126,12 @@ export PPETOOLS_OBJDIR = $(BASE_OBJDIR)/ppetools
endif
ifndef TRACEPP_DIR
-export TRACEPP_DIR = $(abspath ../tracepp)
+export TRACEPP_DIR = $(abspath ../tools/tracepp)
endif
CC_ASM = $(GCC-TOOL-PREFIX)gcc
TCC = $(PPETOOLS_OBJDIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc
-THCC = $(TRACEPP_DIR)/tracepp $(GCC-TOOL-PREFIX)gcc
+THCC = $(PPETOOLS_OBJDIR)/tracepp $(GCC-TOOL-PREFIX)gcc
CC = $(GCC-TOOL-PREFIX)gcc
AS = $(GCC-TOOL-PREFIX)as
AR = $(GCC-TOOL-PREFIX)ar
OpenPOWER on IntegriCloud