Title: [107428] trunk/Source
Revision
107428
Author
[email protected]
Date
2012-02-10 12:17:49 -0800 (Fri, 10 Feb 2012)

Log Message

[Mac] DYLIB_INSTALL_NAME_BASE should not be prefixed by the SDKROOT
https://bugs.webkit.org/show_bug.cgi?id=78320

Patch by Benjamin Poulain <[email protected]> on 2012-02-10
Reviewed by Joseph Pecoraro.

<rdar://problem/10839750>

Source/WebCore: 

* Configurations/WebCore.xcconfig:

Source/WebKit/mac: 

* Configurations/WebKit.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (107427 => 107428)


--- trunk/Source/WebCore/ChangeLog	2012-02-10 20:15:15 UTC (rev 107427)
+++ trunk/Source/WebCore/ChangeLog	2012-02-10 20:17:49 UTC (rev 107428)
@@ -1,3 +1,14 @@
+2012-02-10  Benjamin Poulain  <[email protected]>
+
+        [Mac] DYLIB_INSTALL_NAME_BASE should not be prefixed by the SDKROOT
+        https://bugs.webkit.org/show_bug.cgi?id=78320
+
+        Reviewed by Joseph Pecoraro.
+
+        <rdar://problem/10839750>
+
+        * Configurations/WebCore.xcconfig:
+
 2012-02-10  Anders Carlsson  <[email protected]>
 
         Update the non-fast-scrollable region for subframe layout as well

Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (107427 => 107428)


--- trunk/Source/WebCore/Configurations/WebCore.xcconfig	2012-02-10 20:15:15 UTC (rev 107427)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig	2012-02-10 20:17:49 UTC (rev 107428)
@@ -77,8 +77,8 @@
 WEBCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
 
 NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
 NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
 
 PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));

Modified: trunk/Source/WebKit/mac/ChangeLog (107427 => 107428)


--- trunk/Source/WebKit/mac/ChangeLog	2012-02-10 20:15:15 UTC (rev 107427)
+++ trunk/Source/WebKit/mac/ChangeLog	2012-02-10 20:17:49 UTC (rev 107428)
@@ -1,3 +1,14 @@
+2012-02-10  Benjamin Poulain  <[email protected]>
+
+        [Mac] DYLIB_INSTALL_NAME_BASE should not be prefixed by the SDKROOT
+        https://bugs.webkit.org/show_bug.cgi?id=78320
+
+        Reviewed by Joseph Pecoraro.
+
+        <rdar://problem/10839750>
+
+        * Configurations/WebKit.xcconfig:
+
 2012-02-09  Alexey Proskuryakov  <[email protected]>
 
         REGRESSION (r104885): Articles not displayed in Vienna RSS reader

Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (107427 => 107428)


--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig	2012-02-10 20:15:15 UTC (rev 107427)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig	2012-02-10 20:17:49 UTC (rev 107428)
@@ -83,8 +83,8 @@
 WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
 
 NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
 NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
 
 PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to