Changeset c6bbcdb for benchmark

Timestamp:

Sep 25, 2018, 4:43:25 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

2725882

Parents:

6d44da1

Message:

Fixed shared library version number

File:

• benchmark/Makefile.in (modified) (2 diffs)

benchmark/Makefile.in

@@ -485 +485 @@
         $(am__mv) $$depbase.Tpo $$depbase.Po
 
-<<<<<<< HEAD
 .cfa.lo:
         $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
@@ -491 +490 @@
         $(am__mv) $$depbase.Tpo $$depbase.Plo
 
-LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
-
-=======
->>>>>>> master
 .NOTPARALLEL: