X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/93a3786624b2768d89bfa27e46598dc64e2fb70a..ed1e77d3adeb83d26fd1dfb16dd84cabdcefd250:/Configurations/ToolExecutable.xcconfig

diff --git a/Configurations/ToolExecutable.xcconfig b/Configurations/ToolExecutable.xcconfig
index 8ece997..6ffcc87 100644
--- a/Configurations/ToolExecutable.xcconfig
+++ b/Configurations/ToolExecutable.xcconfig
@@ -21,15 +21,15 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
-INSTALL_PATH_iphoneos = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources;
-INSTALL_PATH_iphonesimulator = $(INSTALL_PATH_iphoneos);
-INSTALL_PATH_macosx = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Versions/A/Resources;
+#include "FeatureDefines.xcconfig"
+#include "Version.xcconfig"
+
+INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR);
 PRODUCT_NAME = $(TARGET_NAME);
-CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(PLATFORM_NAME)_$(TARGET_NAME));
-CODE_SIGN_ENTITLEMENTS_iphoneos_minidom = entitlements.plist;
-CODE_SIGN_ENTITLEMENTS_iphoneos_testapi = entitlements.plist;
-CODE_SIGN_ENTITLEMENTS_iphoneos_testRegExp = entitlements.plist;
+CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = $(CODE_SIGN_ENTITLEMENTS_ios_$(TARGET_NAME));
+CODE_SIGN_ENTITLEMENTS_ios_minidom = entitlements.plist;
+CODE_SIGN_ENTITLEMENTS_ios_testapi = entitlements.plist;
+CODE_SIGN_ENTITLEMENTS_ios_testRegExp = entitlements.plist;
 
 SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
 SKIP_INSTALL_ = YES;
@@ -38,8 +38,16 @@ SKIP_INSTALL_YES = NO;
 
 GCC_ENABLE_OBJC_GC = NO;
 CLANG_ENABLE_OBJC_ARC = $(CLANG_ENABLE_OBJC_ARC_$(CURRENT_ARCH));
-CLANG_ENABLE_OBJC_ARC_i386 = YES;
+CLANG_ENABLE_OBJC_ARC_i386[sdk=iphonesimulator*] = YES;
 CLANG_ENABLE_OBJC_ARC_x86_64 = YES;
-CLANG_ENABLE_OBJC_ARC_arm64 = YES;
 CLANG_ENABLE_OBJC_ARC_armv7 = YES;
+CLANG_ENABLE_OBJC_ARC_armv7k = YES;
 CLANG_ENABLE_OBJC_ARC_armv7s = YES;
+CLANG_ENABLE_OBJC_ARC_arm64 = YES;
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+
+// Explicitly add the PrivateHeaders directory to the search path so that generated header files can be found in production builds.
+HEADER_SEARCH_PATHS = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders $(inherited);