Title: [200458] trunk/Source/_javascript_Core
- Revision
- 200458
- Author
- [email protected]
- Date
- 2016-05-05 10:14:49 -0700 (Thu, 05 May 2016)
Log Message
Unreviewed build fix after change set r200447.
Made the detection of clang version XCode build specific.
Now shouldEnableDebugAnnotations() should return false for all other build types.
* offlineasm/config.rb:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (200457 => 200458)
--- trunk/Source/_javascript_Core/ChangeLog 2016-05-05 16:49:04 UTC (rev 200457)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-05-05 17:14:49 UTC (rev 200458)
@@ -1,3 +1,12 @@
+2016-05-05 Michael Saboff <[email protected]>
+
+ Unreviewed build fix after change set r200447.
+
+ Made the detection of clang version XCode build specific.
+ Now shouldEnableDebugAnnotations() should return false for all other build types.
+
+ * offlineasm/config.rb:
+
2016-05-05 Joseph Pecoraro <[email protected]>
Create console object lazily
Modified: trunk/Source/_javascript_Core/offlineasm/config.rb (200457 => 200458)
--- trunk/Source/_javascript_Core/offlineasm/config.rb 2016-05-05 16:49:04 UTC (rev 200457)
+++ trunk/Source/_javascript_Core/offlineasm/config.rb 2016-05-05 17:14:49 UTC (rev 200458)
@@ -60,18 +60,15 @@
# Allows for source level debuging of the original .asm files in a debugger.
#
def shouldEnableDebugAnnotations()
- if ENV['GCC_VERSION'] =~ /\.clang\./ and ENV['TOOLCHAIN_DIR'] != ''
- clangExecutable = ENV['TOOLCHAIN_DIR'] + '/usr/bin/clang'
- if File.executable?(clangExecutable)
- clangVersionOut = %x`#{clangExecutable} --version`
- if ($? == 0)
- # clang version 800.0.12 or higher is required for debug annotations
- versionMatch = /clang-(\d+).(\d+).(\d+)/.match(clangVersionOut)
- if versionMatch.length >= 4
- totalVersion = versionMatch[1].to_i * 1000000 + versionMatch[2].to_i * 1000 + versionMatch[3].to_i
- if totalVersion >= 800000012
- return true
- end
+ if ENV['GCC_VERSION'] =~ /\.clang\./ and ENV['DT_TOOLCHAIN_DIR'] =~ /Xcode.app/
+ clangVersionOut = %x`xcrun clang --version`
+ if ($? == 0)
+ # clang version 800.0.12 or higher is required for debug annotations
+ versionMatch = /clang-(\d{3,}).(\d{1,3}).(\d{1,3})/.match(clangVersionOut)
+ if versionMatch.length >= 4
+ totalVersion = versionMatch[1].to_i * 1000000 + versionMatch[2].to_i * 1000 + versionMatch[3].to_i
+ if totalVersion >= 800000012
+ return true
end
end
end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
