From dcc67e99ee35eb76168b6d9e6efff948cace87c9 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Sun, 19 Jan 2003 17:47:32 +0000
Subject: [PATCH] Apparently I forgot to check in these changes

[SVN r16937]
---
 gcc-tools.jam    | 29 +++++++++--------------------
 v1/gcc-tools.jam | 29 +++++++++--------------------
 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/gcc-tools.jam b/gcc-tools.jam
index b4aaf48dc..023cb77f3 100644
--- a/gcc-tools.jam
+++ b/gcc-tools.jam
@@ -352,23 +352,17 @@ rule Link-action
     IMPLIB_COMMAND on $(<) = "-Wl,--export-all-symbols -Wl,--exclude-symbols,_bss_end__:_bss_start__:_data_end__:_data_start__ -Wl,--out-implib," ;
     DEPENDS $(<) : $(NEEDLIBS) $(NEEDIMPS) ;
     gRUN_LD_LIBRARY_PATH($(<)) += $(STDLIBPATH:T) ;
-    if $(<[2]) && $(NT) && ( -mno-cygwin in $(gBUILD_PROPERTIES:G=) )
-    {
-        gcc-dllwrap $(<) : $(>) ;
+    
+    # Workaround GCC's lack of command-files and NT's line-length limitation.
+    if $(NT) {
+        JAMSHELL on $(<) = % ;
     }
-    else
+
+    gcc-Link-action $(<) : $(>) ;
+
+    if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
     {
-        # Workaround GCC's lack of command-files and NT's line-length limitation.
-        if $(NT) {
-            JAMSHELL on $(<) = % ;
-        }
-        
-        gcc-Link-action $(<) : $(>) ;
-        
-        if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
-        {
-            return "$(<[1]).$(DLLVERSION)" ;
-        }
+        return "$(<[1]).$(DLLVERSION)" ;
     }
 }
 
@@ -381,11 +375,6 @@ actions gcc-Link-action bind NEEDLIBS NEEDIMPS
     $(ACTION_1)$(LN)$(SPACE)-fs$(SPACE)"$(<[1]:D=)$(OUTTAG)"$(SPACE)"$(<[1])"
 }
 
-actions gcc-dllwrap bind NEEDLIBS NEEDIMPS
-{
-    dllwrap --dllname $(<[1]) -o foo.pyd $(>) -s --entry _DllMain@12 --target=i386-mingw32 -L"$(LIBPATH:T)" -L"$(STDLIBPATH:T)" "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" "$(IMPLIB_FLAGS)$(NEEDIMPS)" -l"$(FINDLIBS)" -Wl,-rpath-link,. $(LINKFLAGS)     
-}
-
 #### Cc #####
 
 rule Cc-action
diff --git a/v1/gcc-tools.jam b/v1/gcc-tools.jam
index b4aaf48dc..023cb77f3 100644
--- a/v1/gcc-tools.jam
+++ b/v1/gcc-tools.jam
@@ -352,23 +352,17 @@ rule Link-action
     IMPLIB_COMMAND on $(<) = "-Wl,--export-all-symbols -Wl,--exclude-symbols,_bss_end__:_bss_start__:_data_end__:_data_start__ -Wl,--out-implib," ;
     DEPENDS $(<) : $(NEEDLIBS) $(NEEDIMPS) ;
     gRUN_LD_LIBRARY_PATH($(<)) += $(STDLIBPATH:T) ;
-    if $(<[2]) && $(NT) && ( -mno-cygwin in $(gBUILD_PROPERTIES:G=) )
-    {
-        gcc-dllwrap $(<) : $(>) ;
+    
+    # Workaround GCC's lack of command-files and NT's line-length limitation.
+    if $(NT) {
+        JAMSHELL on $(<) = % ;
     }
-    else
+
+    gcc-Link-action $(<) : $(>) ;
+
+    if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
     {
-        # Workaround GCC's lack of command-files and NT's line-length limitation.
-        if $(NT) {
-            JAMSHELL on $(<) = % ;
-        }
-        
-        gcc-Link-action $(<) : $(>) ;
-        
-        if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
-        {
-            return "$(<[1]).$(DLLVERSION)" ;
-        }
+        return "$(<[1]).$(DLLVERSION)" ;
     }
 }
 
@@ -381,11 +375,6 @@ actions gcc-Link-action bind NEEDLIBS NEEDIMPS
     $(ACTION_1)$(LN)$(SPACE)-fs$(SPACE)"$(<[1]:D=)$(OUTTAG)"$(SPACE)"$(<[1])"
 }
 
-actions gcc-dllwrap bind NEEDLIBS NEEDIMPS
-{
-    dllwrap --dllname $(<[1]) -o foo.pyd $(>) -s --entry _DllMain@12 --target=i386-mingw32 -L"$(LIBPATH:T)" -L"$(STDLIBPATH:T)" "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" "$(IMPLIB_FLAGS)$(NEEDIMPS)" -l"$(FINDLIBS)" -Wl,-rpath-link,. $(LINKFLAGS)     
-}
-
 #### Cc #####
 
 rule Cc-action