From 33bb382e09d0f49afacdb6745b870ea4907faecb Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Thu, 25 Sep 2014 09:38:16 +0400
Subject: [PATCH] Fix build scripts

---
 build/Makefile |  8 ++++----
 build/build.sh | 32 ++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/build/Makefile b/build/Makefile
index dd545cc3..b0e9430f 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -66,23 +66,23 @@ ifeq ($(platform),mingw)
 $(CDS_DEBUG_LIB): $(BIN_PATH)/$(CDS_DEBUG_LIB)
 
 $(BIN_PATH)/$(CDS_DEBUG_LIB) : $(CDS_OBJS)
-	$(CXX) $(LD_OPTS) -Wl,--out-implib,$(BIN_PATH)/$(CDS_DEBUG_LIB).a $(CDS_OBJS) -o $@ 
+	$(CXX) $(LD_OPTS) -Wl,--out-implib,$(BIN_PATH)/$(CDS_DEBUG_LIB).a $(CDS_OBJS) -o $@ $(LDLIBS)
 
 $(CDS_RELEASE_LIB) : $(BIN_PATH)/$(CDS_RELEASE_LIB)
 
 $(BIN_PATH)/$(CDS_RELEASE_LIB) : $(CDS_OBJS)
-	$(CXX) $(LD_OPTS) $(CDS_OBJS) -Wl,--out-implib,$(BIN_PATH)/$(CDS_RELEASE_LIB).a -o $@ 
+	$(CXX) $(LD_OPTS) $(CDS_OBJS) -Wl,--out-implib,$(BIN_PATH)/$(CDS_RELEASE_LIB).a -o $@ $(LDLIBS)
     
 debug : $(CDS_DEBUG_LIB)
 release : $(CDS_RELEASE_LIB)
 else
 $(CDS_DEBUG_LIB).$(VERSION) : $(CDS_OBJS)
-	$(CXX) $(LD_OPTS) $(CDS_PLATFORM_RELEASE_LDFLAGS) $(CDS_OBJS) -o $@ 
+	$(CXX) $(LD_OPTS) $(CDS_PLATFORM_DEBUG_LDFLAGS) $(CDS_OBJS) -o $@ $(LDLIBS)
 	mv ./$(CDS_DEBUG_LIB).$(VERSION) $(BIN_PATH)/$(CDS_DEBUG_LIB).$(VERSION)
 	ln -sf $(CDS_DEBUG_LIB).$(VERSION) $(BIN_PATH)/$(CDS_DEBUG_LIB)
 
 $(CDS_RELEASE_LIB).$(VERSION) : $(CDS_OBJS)
-	$(CXX) $(LD_OPTS) $(CDS_OBJS) $(CDS_PLATFORM_DEBUG_LDFLAGS) -o $@ 
+	$(CXX) $(LD_OPTS) $(CDS_OBJS) $(CDS_PLATFORM_RELEASE_LDFLAGS) -o $@ $(LDLIBS)
 	mv ./$(CDS_RELEASE_LIB).$(VERSION) $(BIN_PATH)/$(CDS_RELEASE_LIB).$(VERSION)
 	ln -sf $(CDS_RELEASE_LIB).$(VERSION) $(BIN_PATH)/$(CDS_RELEASE_LIB)
     
diff --git a/build/build.sh b/build/build.sh
index 8c14e716..5048d6ab 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -467,15 +467,19 @@ fi
 
 echo ---------------------------------
 echo Make debug library
-CXXFLAGS="$compileroptions $cxx_debug_options $EXTRA_CXXFLAGS"
-export CXXFLAGS
-CFLAGS="$compileroptions $cxx_debug_options $EXTRA_CFLAGS $debugflag "
-export CFLAGS
-LDFLAGS="$linkeroptions -shared $ld_debug_options $ld_libs $EXTRA_LDFLAGS "
-export LDFLAGS
+#CXXFLAGS="$compileroptions $cxx_debug_options $EXTRA_CXXFLAGS"
+#export CXXFLAGS
+#CFLAGS="$compileroptions $cxx_debug_options $EXTRA_CFLAGS $debugflag "
+#export CFLAGS
+#LDFLAGS="$linkeroptions -shared $ld_debug_options $EXTRA_LDFLAGS "
+#export LDFLAGS
 
 mkdir -p $OBJ_PATH/debug
 
+CXXFLAGS="$compileroptions $cxx_debug_options $EXTRA_CXXFLAGS" \
+CFLAGS="$compileroptions $cxx_debug_options $EXTRA_CFLAGS $debugflag " \
+LDLIBS="$ld_libs" \
+LDFLAGS="$linkeroptions -shared $ld_debug_options $EXTRA_LDFLAGS " \
 $MAKE -f Makefile \
      platform=$OS_FAMILY \
      BIN_PATH=$BIN_PATH \
@@ -489,15 +493,19 @@ fi
 echo ---------------------------------
 echo Make release library
 
-CXXFLAGS="$compileroptions $cxx_release_options $EXTRA_CXXFLAGS "
-export CXXFLAGS
-CFLAGS="$compileroptions $cxx_release_options $EXTRA_CFLAGS "
-export CFLAGS
-LDFLAGS="$linkeroptions -shared $ld_resease_options $ld_libs $EXTRA_LDFLAGS "
-export LDFLAGS
+#CXXFLAGS="$compileroptions $cxx_release_options $EXTRA_CXXFLAGS "
+#export CXXFLAGS
+#CFLAGS="$compileroptions $cxx_release_options $EXTRA_CFLAGS "
+#export CFLAGS
+#LDFLAGS="$linkeroptions -shared $ld_resease_options $ld_libs $EXTRA_LDFLAGS "
+#export LDFLAGS
 
 mkdir -p $OBJ_PATH/release
 
+CXXFLAGS="$compileroptions $cxx_release_options $EXTRA_CXXFLAGS " \
+CFLAGS="$compileroptions $cxx_release_options $EXTRA_CFLAGS " \
+LDFLAGS="$linkeroptions -shared $ld_resease_options $EXTRA_LDFLAGS " \
+LDLIBS="$ld_libs" \
 $MAKE -f Makefile \
      platform=$OS_FAMILY \
      BIN_PATH=$BIN_PATH \
-- 
2.34.1