diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index bc06689e37ff..25e5cce05939 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -33,8 +33,12 @@ USE_APP1DEF=
 
 # Link in static data members for template classes
 .IF "$(OS)"=="MACOSX"
+# Allow certain executables to not link to libstatic*.dylib. This is only used
+# by build tools that are built in the bootstrap process.
+.IF "$(NOSHAREDSTATICLIB)"==""
 APP1STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(APP1TARGETN)"!=""
 $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
@@ -212,8 +216,12 @@ USE_APP2DEF=
 
 # Link in static data members for template classes
 .IF "$(OS)"=="MACOSX"
+# Allow certain executables to not link to libstatic*.dylib. This is only used
+# by build tools that are built in the bootstrap process.
+.IF "$(NOSHAREDSTATICLIB)"==""
 APP2STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(APP2TARGETN)"!=""
 $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
@@ -391,8 +399,12 @@ USE_APP3DEF=
 
 # Link in static data members for template classes
 .IF "$(OS)"=="MACOSX"
+# Allow certain executables to not link to libstatic*.dylib. This is only used
+# by build tools that are built in the bootstrap process.
+.IF "$(NOSHAREDSTATICLIB)"==""
 APP3STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(APP3TARGETN)"!=""
 $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
@@ -570,8 +582,12 @@ USE_APP4DEF=
 
 # Link in static data members for template classes
 .IF "$(OS)"=="MACOSX"
+# Allow certain executables to not link to libstatic*.dylib. This is only used
+# by build tools that are built in the bootstrap process.
+.IF "$(NOSHAREDSTATICLIB)"==""
 APP4STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(APP4TARGETN)"!=""
 $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
@@ -749,8 +765,12 @@ USE_APP5DEF=
 
 # Link in static data members for template classes
 .IF "$(OS)"=="MACOSX"
+# Allow certain executables to not link to libstatic*.dylib. This is only used
+# by build tools that are built in the bootstrap process.
+.IF "$(NOSHAREDSTATICLIB)"==""
 APP5STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(APP5TARGETN)"!=""
 $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
@@ -928,8 +948,12 @@ USE_APP6DEF=
 
 # Link in static data members for template classes
 .IF "$(OS)"=="MACOSX"
+# Allow certain executables to not link to libstatic*.dylib. This is only used
+# by build tools that are built in the bootstrap process.
+.IF "$(NOSHAREDSTATICLIB)"==""
 APP6STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(APP6TARGETN)"!=""
 $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
@@ -1107,8 +1131,12 @@ USE_APP7DEF=
 
 # Link in static data members for template classes
 .IF "$(OS)"=="MACOSX"
+# Allow certain executables to not link to libstatic*.dylib. This is only used
+# by build tools that are built in the bootstrap process.
+.IF "$(NOSHAREDSTATICLIB)"==""
 APP7STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(APP7TARGETN)"!=""
 $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
@@ -1286,8 +1314,12 @@ USE_APP8DEF=
 
 # Link in static data members for template classes
 .IF "$(OS)"=="MACOSX"
+# Allow certain executables to not link to libstatic*.dylib. This is only used
+# by build tools that are built in the bootstrap process.
+.IF "$(NOSHAREDSTATICLIB)"==""
 APP8STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(APP8TARGETN)"!=""
 $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
@@ -1465,8 +1497,12 @@ USE_APP9DEF=
 
 # Link in static data members for template classes
 .IF "$(OS)"=="MACOSX"
+# Allow certain executables to not link to libstatic*.dylib. This is only used
+# by build tools that are built in the bootstrap process.
+.IF "$(NOSHAREDSTATICLIB)"==""
 APP9STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(APP9TARGETN)"!=""
 $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
@@ -1644,8 +1680,12 @@ USE_APP10DEF=
 
 # Link in static data members for template classes
 .IF "$(OS)"=="MACOSX"
+# Allow certain executables to not link to libstatic*.dylib. This is only used
+# by build tools that are built in the bootstrap process.
+.IF "$(NOSHAREDSTATICLIB)"==""
 APP10STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(APP10TARGETN)"!=""
 $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index caeb749466c6..98a934f4d309 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -3,8 +3,8 @@
 #*    $Workfile:   tg_app.mk  $
 #*
 #*    Ersterstellung    XX  TT.MM.JJ
-#*    Letzte Aenderung  $Author: pluby $ $Date: 2001-03-09 04:33:09 $
-#*    $Revision: 1.21 $
+#*    Letzte Aenderung  $Author: pluby $ $Date: 2001-03-09 18:29:48 $
+#*    $Revision: 1.22 $
 #*
 #*    $Logfile:   T:/solar/inc/tg_app.mkv  $
 #*
@@ -79,8 +79,12 @@ USE_APP$(TNR)DEF=
 
 # Link in static data members for template classes
 .IF "$(OS)"=="MACOSX"
+# Allow certain executables to not link to libstatic*.dylib. This is only used
+# by build tools that are built in the bootstrap process.
+.IF "$(NOSHAREDSTATICLIB)"==""
 APP$(TNR)STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(APP$(TNR)TARGETN)"!=""
 $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \