diff options
| author | stuconnolly <stuart02@gmail.com> | 2010-10-16 22:46:44 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2010-10-16 22:46:44 +0000 |
| commit | 23cbc5372a7bb06b491fe906956d6523e2e6daf7 (patch) | |
| tree | 2d517ab7462bd4ee521ab96ca5b18fcce702a1ea /Source/RegexKitLite.m | |
| parent | 60c5717869cdd6f68355f720b63a6df1bb7c87c6 (diff) | |
| download | sequelpro-23cbc5372a7bb06b491fe906956d6523e2e6daf7.tar.gz sequelpro-23cbc5372a7bb06b491fe906956d6523e2e6daf7.tar.bz2 sequelpro-23cbc5372a7bb06b491fe906956d6523e2e6daf7.zip | |
Tidy up linker flags across all targets, specifically remove linking against stdc++, which was introduced in r2444 as a workaround for a bug in Clang 1.5 that failed to compile RegexKitLite. Take the approach suggested by the developer of RegexKitLite, which is to disable the macro that uses __attribute__((cleanup)), which trips the bug. Apparently it is only used for debugging purposes. See http://llvm.org/viewvc/llvm-project?view=rev&revision=103938 for the Clang fix.
Diffstat (limited to 'Source/RegexKitLite.m')
| -rw-r--r-- | Source/RegexKitLite.m | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/RegexKitLite.m b/Source/RegexKitLite.m index dababa6a..a3e3dce1 100644 --- a/Source/RegexKitLite.m +++ b/Source/RegexKitLite.m @@ -165,8 +165,9 @@ typedef uint32_t RKLLookasideCache_t; #define RKL_EXPECTED(cond, expect) __builtin_expect((long)(cond), (expect)) #define RKL_PREFETCH(ptr) __builtin_prefetch(ptr) #define RKL_PREFETCH_UNICHAR(ptr, off) { const char *p = ((const char *)(ptr)) + ((off) * sizeof(UniChar)) + _RKL_PREFETCH_SIZE; RKL_PREFETCH(p); RKL_PREFETCH(p + _RKL_PREFETCH_SIZE); } -#define RKL_HAVE_CLEANUP -#define RKL_CLEANUP(func) RKL_ATTRIBUTES(cleanup(func)) +//#define RKL_HAVE_CLEANUP +//#define RKL_CLEANUP(func) RKL_ATTRIBUTES(cleanup(func)) +#define RKL_CLEANUP(func) #else // defined (__GNUC__) && (__GNUC__ >= 4) #define RKL_ATTRIBUTES(attr, ...) #define RKL_EXPECTED(cond, expect) (cond) |