From 63eda9498a8d6f03e57ba0bc5d7fc314aeb0e74f Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Fri, 25 Jan 2019 16:50:15 +0800
Subject: [PATCH] test fix

---
 src/cc/Makefile | 34 ----------------------------------
 zcutil/build.sh | 19 +++----------------
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 src/cc/Makefile

diff --git a/src/cc/Makefile b/src/cc/Makefile
deleted file mode 100644
index f283f5865..000000000
--- a/src/cc/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-SHELL		= /bin/sh
-CC			= gcc
-CC_DARWIN	= g++-6
-CC_WIN		= x86_64-w64-mingw32-gcc-posix
-CFLAGS_DARWIN	= -std=c++11 -arch x86_64 -I/usr/local/Cellar/gcc\@6/6.4.0_2/include/c++/6.4.0/ -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -c -Wl,-undefined -Wl,dynamic_lookup -dynamiclib
-CFLAGS		= -std=c++11 -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c
-CFLAGS_WIN	= -std=c++11 -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c
-DEBUGFLAGS	= -O0 -D _DEBUG
-RELEASEFLAGS	= -O2 -D NDEBUG -combine -fwhole-program
-$(info $(OS))
-OS := $(shell uname -s)
-$(info $(OS))
-TARGET  = ../libcc.so
-TARGET_DARWIN = ../libcc.dylib
-TARGET_WIN = ../libcc.dll
-SOURCES = cclib.cpp
-#HEADERS = $(shell echo ../cryptoconditions/include/*.h)
-
-all: $(TARGET)
-
-$(TARGET): $(SOURCES)
-	$(info Building cclib to src/)
-ifeq ($(OS),Darwin)
-	$(CC_DARWIN) $(CFLAGS_DARWIN) $(DEBUGFLAGS) -o $(TARGET_DARWIN) $(SOURCES)
-else ifeq ($(OS),Linux)
-	$(CC) $(CFLAGS) $(DEBUGFLAGS) -o $(TARGET) $(SOURCES)
-#else ifeq ($(WIN_HOST),True) - todo: pass ENV var from build.sh if WIN host
-else
-	$(info WINDOWS)
-	$(CC_WIN) $(CFLAGS_WIN) $(DEBUGFLAGS) -o $(TARGET_WIN) $(SOURCES)
-endif
-
-clean:
-	rm -rf $(TARGET)
diff --git a/zcutil/build.sh b/zcutil/build.sh
index 5870f127a..131f67d0f 100755
--- a/zcutil/build.sh
+++ b/zcutil/build.sh
@@ -101,25 +101,12 @@ eval "$MAKE" --version
 as --version
 ld -v
 
-../src/cc/makecclib
+#BUILD CCLIB
+cd src/cc/ 
+./makecclib
 
 HOST="$HOST" BUILD="$BUILD" NO_PROTON="$PROTON_ARG" "$MAKE" "$@" -C ./depends/ V=1
 ./autogen.sh
 
-#BUILD CCLIB
-
-WD=$PWD
-cd src/cc
-echo $PWD
-
-if make "$@"; then
-  echo CCLIB BUILD SUCCESSFUL
-else
-  echo CCLIB BUILD FAILED
-  exit 1
-fi
-
-cd $WD
-
 CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" $CONFIGURE_FLAGS CXXFLAGS='-g'
 "$MAKE" "$@" V=1