diff options
| author | William Bryan <wilbryan@us.ibm.com> | 2016-10-20 13:53:03 -0500 |
|---|---|---|
| committer | William A. Bryan <wilbryan@us.ibm.com> | 2016-10-24 11:25:55 -0400 |
| commit | a4e04571d60b58c0c778c870bc215bf467085fb6 (patch) | |
| tree | cff81d38b342965bcfb90b509cd1591a194bfdf2 /src/Makefile | |
| parent | f5f808eb2918e96bcdf324bd2dd90853bf9b5f3c (diff) | |
| download | talos-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/Makefile')
| -rwxr-xr-x | src/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index b72cbc4..83e8994 100755 --- a/src/Makefile +++ b/src/Makefile @@ -42,7 +42,7 @@ export PPETOOLS_OBJDIR = $(abspath ../obj/ppetools) endif ifndef TRACEPP_DIR -export TRACEPP_DIR = $(abspath tracepp) +export TRACEPP_DIR = $(abspath tools/tracepp) endif ifndef PK_SRCDIR @@ -63,7 +63,6 @@ COMBINEIMAGE = $(MAKE) combineImage -C $(dir) IMAGEFILE = $(OBJDIR)/image.bin NEEDED_IMAGES = \ - $(TRACEPP_DIR)/tracepp \ $(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(IMAGE_HDR_SCRIPT) \ $(OBJDIR)/$(OCC_405_IMAGE_NAME)/$(OCC_405_IMAGE_NAME).out \ $(OBJDIR)/$(OCC_GPE0_IMAGE_NAME)/$(OCC_GPE0_IMAGE_NAME).out \ @@ -74,7 +73,7 @@ NEEDED_IMAGES = \ all: ppetools $(NEEDED_IMAGES) combineImage tracehash .PHONY: ppetools -ppetools: $(PPETOOLS_OBJDIR)/ppetracepp $(PPETOOLS_OBJDIR)/ppe2fsp +ppetools: $(PPETOOLS_OBJDIR)/ppetracepp $(PPETOOLS_OBJDIR)/ppe2fsp $(PPETOOLS_OBJDIR)/tracepp $(PPETOOLS_OBJDIR)/ppetracepp: $(PPETOOLS_OBJDIR) g++ -O3 -w -g -I$(PPETRACEPP_DIR)/ $(PPETRACEPP_DIR)/ppetracepp.C -o $(PPETOOLS_OBJDIR)/ppetracepp @@ -103,7 +102,6 @@ combineImage: $(NEEDED_IMAGES) .PHONY : clean clean: rm -fr $(OBJDIR) - rm -f $(TRACEPP_DIR)/tracepp # Make binary application images .PHONY : $(OBJDIR)/$(OCC_405_IMAGE_NAME)/$(OCC_405_IMAGE_NAME).out @@ -122,7 +120,7 @@ $(OBJDIR)/$(OCC_GPE1_IMAGE_NAME)/$(OCC_GPE1_IMAGE_NAME).out: $(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(OCC_BOOTLOADER_NAME).out $(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(IMAGE_HDR_SCRIPT): (cd $(SRCDIR)/$(OCC_BOOTLOADER_DIR_NAME) && make) -$(TRACEPP_DIR)/tracepp: +$(PPETOOLS_OBJDIR)/tracepp: (cd $(TRACEPP_DIR) && make) # collect all of the trace hash files for all OCC images into a single trexStringFile |
