Title: [177213] tags/Safari-601.1.12.1/Source/_javascript_Core

Diff

Modified: tags/Safari-601.1.12.1/Source/_javascript_Core/ChangeLog (177212 => 177213)


--- tags/Safari-601.1.12.1/Source/_javascript_Core/ChangeLog	2014-12-12 05:59:46 UTC (rev 177212)
+++ tags/Safari-601.1.12.1/Source/_javascript_Core/ChangeLog	2014-12-12 06:00:59 UTC (rev 177213)
@@ -1,3 +1,14 @@
+2014-12-11  Babak Shafiei  <[email protected]>
+
+        Merge r177210.
+
+    2014-12-11  Dan Bernstein  <[email protected]>
+
+            iOS Simulator production build fix.
+
+            * Configurations/_javascript_Core.xcconfig: Don’t use an order file when building for the iOS
+            Simulator, as we did prior to 177027.
+
 2014-12-11  Joseph Pecoraro  <[email protected]>
 
         Explicitly export somre more RWIProtocol classes.

Modified: tags/Safari-601.1.12.1/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (177212 => 177213)


--- tags/Safari-601.1.12.1/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2014-12-12 05:59:46 UTC (rev 177212)
+++ tags/Safari-601.1.12.1/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2014-12-12 06:00:59 UTC (rev 177213)
@@ -40,7 +40,7 @@
 OTHER_LDFLAGS[sdk=iphone*] = $(inherited) $(OTHER_LDFLAGS_BASE);
 OTHER_LDFLAGS[sdk=macosx*] = $(inherited) $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices;
 
-SECTORDER_FLAGS[sdk=iphone*] = $(SECTORDER_FLAGS_ios_$(CONFIGURATION));
+SECTORDER_FLAGS[sdk=iphoneos*] = $(SECTORDER_FLAGS_ios_$(CONFIGURATION));
 SECTORDER_FLAGS_ios_Production = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/_javascript_Core.order;
 SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME)_$(CONFIGURATION));
 SECTORDER_FLAGS_macosx_Production = -Wl,-order_file,_javascript_Core.order;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to