All pastes #73959 Raw Edit

Someone

public text v1 · immutable
#73959 ·published 2006-06-28 14:04 UTC
rendered paste body
diff -rU3 ../supertux-pristine/mk/jam/macosx.jam ./mk/jam/macosx.jam
--- ../supertux-pristine/mk/jam/macosx.jam	2006-06-27 11:34:58.000000000 -0700
+++ ./mk/jam/macosx.jam	2006-06-28 06:10:35.000000000 -0700
@@ -39,7 +39,13 @@
   local target = $($(<)_TARGET) ;
   Depends $(target) : $(>) ;
     
-  LinkApplication $(target) : $(>) ;
+  #LinkApplication $(target) : $(>) ;
+
+  removeLinkerInputFile $(target) ;
+  local i ;
+  for i in $(>) { AppendLinkerInputFile $(target) : $(i) ; }
+  LinkApplicationFromFile $(target) ;
+
   LIBS on $(target) = $(LIBS) ;
   Clean clean : $(target) ;
   Clean $(<)clean : $(target) ;
@@ -53,3 +59,20 @@
   $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS)
 }
 
+actions removeLinkerInputFile
+{
+  $(RM) $(<).opt
+}
+
+actions together piecemeal AppendLinkerInputFile
+{
+  echo $(>) >> $(<).opt
+}
+
+actions LinkApplicationFromFile bind NEEDLIBS bind EXTRAOBJECTS
+{
+  $(MACOSX.ENVIRON)
+  $(LINK) -o $(<) -Xlinker @$(<).opt $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS)
+  $(RM) $(<).opt
+}
+
diff -rU3 ../supertux-pristine/mk/jam/unix.jam ./mk/jam/unix.jam
--- ../supertux-pristine/mk/jam/unix.jam	2006-06-27 11:34:58.000000000 -0700
+++ ./mk/jam/unix.jam	2006-06-28 06:02:57.000000000 -0700
@@ -33,7 +33,13 @@
     local target = $($(<)_TARGET) ;
   
     Depends $(target) : $(>) ;
-    LinkApplication $(target) : $(>) ;
+    #LinkApplication $(target) : $(>) ;
+
+    removeLinkerInputFile $(target) ;
+    local i ;
+    for i in $(>) { AppendLinkerInputFile $(target) : $(i) ; }
+    LinkApplicationFromFile $(target) ;
+
     LIBS on $(target) = $(LIBS) ;
     # setup clean rules
     Clean clean : $(target) ;
@@ -45,4 +51,19 @@
     $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS)
 }
 
+actions removeLinkerInputFile
+{
+    $(RM) $(<).opt
+}
+
+actions together piecemeal AppendLinkerInputFile
+{
+    echo $(>) >> $(<).opt
+}
+
+actions LinkApplicationFromFile bind NEEDLIBS bind EXTRAOBJECTS
+{
+    $(LINK) -o $(<) -Xlinker @$(<).opt $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS)
+    $(RM) $(<).opt
+}
 
diff -rU3 ../supertux-pristine/mk/jam/win32.jam ./mk/jam/win32.jam
--- ../supertux-pristine/mk/jam/win32.jam	2006-06-27 11:34:58.000000000 -0700
+++ ./mk/jam/win32.jam	2006-06-28 06:11:30.000000000 -0700
@@ -58,7 +58,13 @@
   local target = $($(<)_TARGET) ;
 
   Depends $(target) : $(>) ;
-  LinkApplication $(target) : $(>) ;
+  #LinkApplication $(target) : $(>) ;
+
+  removeLinkerInputFile $(target) ;
+  local i ;
+  for i in $(>) { AppendLinkerInputFile $(target) : $(i) ; }
+  LinkApplicationFromFile $(target) ;
+
   LIBS on $(target) = $(LIBS) ;
   # setup clean rules
   Clean clean : $(target) ;
@@ -70,3 +76,19 @@
   $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS)
 }
 
+actions removeLinkerInputFile
+{
+    $(RM) $(<).opt
+}
+
+actions together piecemeal AppendLinkerInputFile
+{
+    echo $(>) >> $(<).opt
+}
+
+actions LinkApplicationFromFile bind NEEDLIBS bind EXTRAOBJECTS
+{
+    $(LINK) -o $(<) -Xlinker @$(<).opt $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS)
+    $(RM) $(<).opt
+}
+