[csih - Cygwin service installation helper, a helper script and tools to create service installation scripts] branch master, updated. v0_9_10-2-gb32074f

corinna@sourceware.org corinna@sourceware.org
Fri Jun 15 13:31:00 GMT 2018




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/csih.git;h=b32074f66a5d2df1267b47d1e99b1fd299cde42b

commit b32074f66a5d2df1267b47d1e99b1fd299cde42b
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Fri Jun 15 15:29:28 2018 +0200

    Bump version to 0.9.11.
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/csih.git;h=d71628b217486a9831d0478435754457b4f63283

commit d71628b217486a9831d0478435754457b4f63283
Author: Corinna Vinschen <vinschen@redhat.com>
Date:   Fri Jun 15 15:29:01 2018 +0200

    Link native tools with --static
    
    This avoids dependencies to libssp-0.dll and libwinpthread-1.dll at runtime
    
    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>


Diff:
---
 native/Makefile |    5 ++---
 version.h       |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/native/Makefile b/native/Makefile
index 77c5a28..0ed53de 100644
--- a/native/Makefile
+++ b/native/Makefile
@@ -17,8 +17,7 @@ NATIVECC=$(NATIVE)gcc
 NATIVECXX=$(NATIVE)g++
 NATIVEAR=$(NATIVE)ar
 
-LDFLAGS=-static-libgcc
-CXXLDFLAGS=-static-libgcc -static-libstdc++
+LDFLAGS=--static
 
 INCLUDES=
 LIBS=
@@ -43,7 +42,7 @@ NATIVE_LIB_OBJ=$(filter %.$(O),$(NATIVE_LIB_SRC:.cpp=.$(O))) \
 all : $(PROGRAMS)
 
 getAccountName$(EXEEXT): getAccountName.$(O) $(NATIVE_LIB) Win32Error.h
-	$(NATIVECXX) $(CFLAGS) $(CXXLDFLAGS) -o $@ $< $(LIBS) $(NATIVE_LIB)
+	$(NATIVECXX) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(NATIVE_LIB)
 
 winProductName$(EXEEXT): winProductName.$(O) $(NATIVE_LIB)
 	$(NATIVECC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(NTDLL)
diff --git a/version.h b/version.h
index 1a507d8..a08d314 100644
--- a/version.h
+++ b/version.h
@@ -2,5 +2,5 @@
 #define STRINGIFY1(s) #s
 #define VERSION_MAJOR  0
 #define VERSION_MINOR  9
-#define VERSION_MICRO  10
+#define VERSION_MICRO  11
 #define VERSION_STRING STRINGIFY(VERSION_MAJOR) "." STRINGIFY(VERSION_MINOR) "." STRINGIFY(VERSION_MICRO)



More information about the Cygwin-apps-cvs mailing list