Skip to content
Snippets Groups Projects
Commit 2283ff66 authored by Nicolas "Pixel" Noble's avatar Nicolas "Pixel" Noble
Browse files

Fixing dll hell.

parent 1723044a
No related branches found
No related tags found
No related merge requests found
...@@ -109,6 +109,11 @@ $CFLAGS << ' -pedantic ' ...@@ -109,6 +109,11 @@ $CFLAGS << ' -pedantic '
$CFLAGS << ' -Werror ' $CFLAGS << ' -Werror '
$CFLAGS << ' -Wno-format ' $CFLAGS << ' -Wno-format '
case RUBY_PLATFORM
when /mingw|mswin/
$LDFLAGS << ' -static '
end
subdir = RUBY_VERSION.sub(/\.\d$/,'') subdir = RUBY_VERSION.sub(/\.\d$/,'')
output = File.join('grpc', 'grpc') output = File.join('grpc', 'grpc')
puts 'Generating Makefile for ' + output puts 'Generating Makefile for ' + output
......
...@@ -93,6 +93,9 @@ RUN mv /opt/mingw/mingw32/bin/i686-w64-mingw32-strip /opt/mingw/mingw32/bin/i686 ...@@ -93,6 +93,9 @@ RUN mv /opt/mingw/mingw32/bin/i686-w64-mingw32-strip /opt/mingw/mingw32/bin/i686
RUN find / -name rbconfig.rb | while read f ; do sed -i 's/0x0501/0x0600/' $f ; done RUN find / -name rbconfig.rb | while read f ; do sed -i 's/0x0501/0x0600/' $f ; done
RUN find / -name win32.h | while read f ; do sed -i 's/gettimeofday/rb_gettimeofday/' $f ; done RUN find / -name win32.h | while read f ; do sed -i 's/gettimeofday/rb_gettimeofday/' $f ; done
RUN sed -i 's/defined.__MINGW64__.$/1/' /usr/local/rake-compiler/ruby/i686-w64-mingw32/ruby-2.0.0-p645/include/ruby-2.0.0/ruby/win32.h RUN sed -i 's/defined.__MINGW64__.$/1/' /usr/local/rake-compiler/ruby/i686-w64-mingw32/ruby-2.0.0-p645/include/ruby-2.0.0/ruby/win32.h
RUN find / -name libwinpthread.dll.a | while read f ; do rm $f ; done
RUN find / -name libwinpthread-1.dll | while read f ; do rm $f ; done
RUN find / -name *msvcrt-ruby*.dll.a | while read f ; do n=`echo $f | sed s/.dll//` ; mv $f $n ; done
# Install SIGINT forwarder # Install SIGINT forwarder
COPY build/sigfw.c /root/ COPY build/sigfw.c /root/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment