summaryrefslogtreecommitdiffstats
path: root/src/ssx
diff options
context:
space:
mode:
authorMatt Spinler <spinler@us.ibm.com>2014-11-19 12:20:22 -0600
committerStephan Broyles <sbroyles@us.ibm.com>2014-11-26 20:44:20 -0600
commitd973cfffd6023e0b5db1a1e1e652819b99f125c3 (patch)
treea9889fcae6dc85417478bb191742616301d01321 /src/ssx
parent27f224a0daa1b1bcca16061b5bb4f2fdd43a2b52 (diff)
downloadtalos-occ-d973cfffd6023e0b5db1a1e1e652819b99f125c3.tar.gz
talos-occ-d973cfffd6023e0b5db1a1e1e652819b99f125c3.zip
Build our own tracepp. Update compiler path.
Change-Id: I3e9e8a10514c806be33d0f6689647c61fb4544f2 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14551 Reviewed-by: Stephan Broyles <sbroyles@us.ibm.com> Tested-by: Stephan Broyles <sbroyles@us.ibm.com>
Diffstat (limited to 'src/ssx')
-rwxr-xr-xsrc/ssx/pgp/ssx.mk16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/ssx/pgp/ssx.mk b/src/ssx/pgp/ssx.mk
index 348718d..3a3050f 100755
--- a/src/ssx/pgp/ssx.mk
+++ b/src/ssx/pgp/ssx.mk
@@ -43,8 +43,6 @@
# your .profile.
# >> gitprep
-# Use fips tracepp
-TRACEPP = /afs/austin/projects/esw/fips820/Builds/built/tools/x86/tracepp
export OCCROOT = $(dir $(lastword $(MAKEFILE_LIST)))../../
ifndef SIMICS_ENVIRONMENT
@@ -54,16 +52,24 @@ endif
ifndef GCC-TOOL-PREFIX
# >> gitprep
-# The new compiler for GNU builds
+
+#CROSS_PREFIX may be set by
+#op-build/openpower/package/occ/occ.mk
+
+ifdef CROSS_PREFIX
+GCC-TOOL-PREFIX = $(CROSS_PREFIX)
+else
GCC-TOOL-PREFIX = powerpc64-unknown-linux-gnu-
endif
+endif
+
ifndef HOST-PREFIX
HOST-PREFIX = x86_64-pc-linux-gnu-
endif
-JAIL = $(HOST-PREFIX)jail
-CC_ASM = $(GCC-TOOL-PREFIX)gcc # Assembly still doesn't use tracepp
+JAIL = $(HOST-PREFIX)jail
+CC_ASM = $(GCC-TOOL-PREFIX)gcc
CC = $(TRACEPP) $(GCC-TOOL-PREFIX)gcc
AS = $(JAIL) /usr/bin/as
AR = $(JAIL) /usr/bin/ar
OpenPOWER on IntegriCloud