Changeset 171212 in webkit for trunk/Source/JavaScriptCore/Configurations

Timestamp:

Jul 17, 2014, 8:59:47 PM (11 years ago)

Author:

[email protected]

Message:

SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
<​http://webkit.org/b/135006>

Reviewed by Darin Adler.

Source/JavaScriptCore:

• Configurations/Base.xcconfig: Move SECTORDER_FLAGS to

JavaScriptCore.xcconfig.

• Configurations/CompileRuntimeToLLVMIR.xcconfig: Remove empty

SECTORDER_FLAGS definition.

• Configurations/DebugRelease.xcconfig: Ditto.
• Configurations/JavaScriptCore.xcconfig: Use $(CONFIGURATION)

so SECTORDER_FLAGS is only set on Production builds.

Source/WebCore:

• Configurations/Base.xcconfig: Move SECTORDER_FLAGS to

WebCore.xcconfig.

• Configurations/DebugRelease.xcconfig: Remove empty

SECTORDER_FLAGS definition.

• Configurations/WebCoreTestShim.xcconfig: Ditto.
• Configurations/WebCoreTestSupport.xcconfig: Ditto.
• Configurations/WebCore.xcconfig: Use $(CONFIGURATION) so

SECTORDER_FLAGS is only set on Production builds.

Source/WebKit:

• WebKit.xcodeproj/project.pbxproj: Remove references to unused

WebKit.xcconfig file.

Source/WebKit/mac:

• Configurations/Base.xcconfig: Move SECTORDER_FLAGS to

WebKitLegacy.xcconfig.

• Configurations/DebugRelease.xcconfig: Remove empty

SECTORDER_FLAGS definition.

• Configurations/WebKit.xcconfig: Removed. Unused.
• Configurations/WebKitLegacy.xcconfig: Use $(CONFIGURATION) so

SECTORDER_FLAGS is only set on Production builds.

Source/WebKit2:

• Configurations/Base.xcconfig: Move SECTORDER_FLAGS to

WebKit.xcconfig.

• Configurations/DebugRelease.xcconfig: Remove empty

SECTORDER_FLAGS definition.

• Configurations/WebKit.xcconfig: Use $(CONFIGURATION) so

SECTORDER_FLAGS is only set on Production builds.

Location:

trunk/Source/JavaScriptCore/Configurations

Files:

• Base.xcconfig (modified) (2 diffs)
• CompileRuntimeToLLVMIR.xcconfig (modified) (1 diff)
• DebugRelease.xcconfig (modified) (2 diffs)
• JavaScriptCore.xcconfig (modified) (2 diffs)

trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

@@ -1 @@
-// Copyright (C) 2009, 2010, 2011, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2011, 2013, 2014 Apple Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -145 +145 @@
 DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
 
-SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME));
-SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/JavaScriptCore.order;
-SECTORDER_FLAGS_macosx = -Wl,-order_file,JavaScriptCore.order;
-
 SDKROOT = macosx.internal;
 

trunk/Source/JavaScriptCore/Configurations/CompileRuntimeToLLVMIR.xcconfig

@@ -35 +35 @@
 HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" $(HEADER_SEARCH_PATHS);
 
-SECTORDER_FLAGS = ;
-
 OTHER_CFLAGS = -c -flto;
 OTHER_CPLUSPLUSFLAGS = -c -flto;

trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig

@@ -1 @@
-// Copyright (C) 2009, 2010, 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -39 +39 @@
 DEBUG_INFORMATION_FORMAT = dwarf;
 
-SECTORDER_FLAGS = ; 
-
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);

trunk/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

@@ -1 @@
-// Copyright (C) 2009 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2014 Apple Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -42 +42 @@
 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
 OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices;
+
+SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
+SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/JavaScriptCore.order;
+SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,JavaScriptCore.order;
+
 GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;