Cleanup: removed workaround to patch stx/projects/smalltalk/bc.mak for MINGW
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 08 Jun 2016 15:22:39 +0100
changeset 37 61064ee32813
parent 36 2d53d5e44347
child 38 7b2b274f0f5a
Cleanup: removed workaround to patch stx/projects/smalltalk/bc.mak for MINGW * Since stx/projects/smalltalk package is now forked, there's no need to patch it during build. * bc.mak now copies runtime library required by MINGW32 itself, no need to do it manually in rake scripts.
specs/stx-jv.rbspec
--- a/specs/stx-jv.rbspec	Tue Jun 07 23:32:53 2016 +0100
+++ b/specs/stx-jv.rbspec	Wed Jun 08 15:22:39 2016 +0100
@@ -115,27 +115,7 @@
         end
       end
     end
-  
-  if (TOOLCHAIN == "mingw32" || TOOLCHAIN == 'mingw') then
-    task :'compile:post' => BUILD_DIR / 'stx' / 'projects' / 'smalltalk' / 'libgcc_s_dw2-1.dll'
-    
-    file BUILD_DIR / 'stx' / 'projects' / 'smalltalk' / 'libgcc_s_dw2-1.dll' do
-      cp ENV['MINGW_DIR'] / 'bin' / 'libgcc_s_dw2-1.dll' , BUILD_DIR / 'stx' / 'projects' / 'smalltalk' / 'libgcc_s_dw2-1.dll'
-    end
-  end
-  
-  task :'stx:projects/smalltalk:pre' do   
-    chdir (BUILD_DIR / 'stx' / 'projects' / 'smalltalk') do         
-      # Hack for MINGW32 - must patch bc.mak ifdefs, sigh.
-      # use ruby instead of sed as ruby has to be installed anyway    
-      cmd = "ruby -ibkp -pe \"gsub /ifdef USEMINGW64/, 'if defined(USEMINGW64) || defined(USEMINGW32)'\" bc.mak"
-      #puts cmd
-      if not system(cmd)  then
-          raise Exception.new("Cannot patch bc.mak")
-      end      
-    end     
-  end
-    
+        
   if win32_wine?
 
     task :'stx:projects/smalltalk:pre' do