refresh of json patch for polly

This commit is contained in:
Sylvestre Ledru 2014-03-15 12:37:52 +00:00
parent fa111a516a
commit c4023a670c

View File

@ -1,30 +1,26 @@
Index: llvm-toolchain-snapshot_3.5~svn203903/polly/lib/Makefile Index: llvm-toolchain-snapshot_3.5~svn204005/polly/lib/Makefile
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn203903.orig/polly/lib/Makefile 2014-03-14 09:01:28.397124053 +0100 --- llvm-toolchain-snapshot_3.5~svn204005.orig/polly/lib/Makefile 2014-03-15 13:31:47.078458657 +0100
+++ llvm-toolchain-snapshot_3.5~svn203903/polly/lib/Makefile 2014-03-14 09:02:20.821790117 +0100 +++ llvm-toolchain-snapshot_3.5~svn204005/polly/lib/Makefile 2014-03-15 13:37:10.367703705 +0100
@@ -27,9 +27,6 @@ @@ -13,7 +13,7 @@
DIRS += Support CPP.Flags += $(POLLY_INC)
USEDLIBS += pollysupport.a LD.Flags += $(POLLY_LD) $(POLLY_LIB)
-DIRS += JSON
-USEDLIBS += pollyjson.a
-
DIRS += Transform
USEDLIBS += pollytransform.a
@@ -40,7 +37,7 @@
#
include $(LEVEL)/Makefile.common
-LIBS += $(POLLY_LD) $(POLLY_LIB) -LIBS += $(POLLY_LD) $(POLLY_LIB)
+LIBS += $(POLLY_LD) $(POLLY_LIB) -ljsoncpp +LIBS += $(POLLY_LD) $(POLLY_LIB) -ljsoncpp
$(LibDir)/libpollyanalysis.a : $(LibDir)/.dir $(PROJ_OBJ_DIR)/Analysis/$(BuildMode)/.dir \ include $(LEVEL)/Makefile.config
$(PROJ_SRC_DIR)/Analysis/*
@@ -106,4 +103,4 @@ @@ -46,9 +46,9 @@
$(CP) $(PROJ_SRC_DIR)/Transform/Makefile Transform/Makefile; \ ISL_CODEGEN_FILES= CodeGen/IslAst.cpp \
fi; \ CodeGen/IslCodeGeneration.cpp
($(MAKE) -C Transform $@ ) || exit 1; \
- fi -POLLY_JSON_FILES= JSON/json_reader.cpp \
\ No newline at end of file - JSON/json_value.cpp \
+ fi - JSON/json_writer.cpp
+# POLLY_JSON_FILES= JSON/json_reader.cpp \
+# JSON/json_value.cpp \
+# JSON/json_writer.cpp
SOURCES= Polly.cpp \
Support/GICHelper.cpp \