aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-10-31 00:04:48 +0000
committerlloyd <[email protected]>2012-10-31 00:04:48 +0000
commitb1151e68a512661fa2939d2f1db1c99adb2961d7 (patch)
treeed4fccf61a1669311ff271d044f2c3c7f151b1a1 /src
parent9151952c4174607678139f9ccb582aa3b886b519 (diff)
parent679b535b0d0f3d0276d463ac927c27bd4411e217 (diff)
merge of '0d8168d68d428ec31702feaf6049b2e95b082088'
and '46ad1751e2e23235d72acc155ac99b46557298dc'
Diffstat (limited to 'src')
-rw-r--r--src/build-data/cc/clang.txt2
-rwxr-xr-xsrc/build-data/scripts/dist.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 06f87f524..40bdb0a0b 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -27,6 +27,8 @@ visibility_attribute '__attribute__((visibility("default")))'
<so_link_flags>
# The default works for GNU ld and several other Unix linkers
default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
+
+darwin -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
</so_link_flags>
<mach_opt>
diff --git a/src/build-data/scripts/dist.py b/src/build-data/scripts/dist.py
index b32edd73f..70f655bce 100755
--- a/src/build-data/scripts/dist.py
+++ b/src/build-data/scripts/dist.py
@@ -183,7 +183,7 @@ def main(args = None):
if line == 'release_vc_rev = None\n':
yield 'release_vc_rev = \'mtn:%s\'\n' % (rev_id)
elif line == 'release_datestamp = 0\n':
- yield 'release_vc_rev = %d\n' % (datestamp(rev_iv))
+ yield 'release_vc_rev = %d\n' % (datestamp(options.mtn_db, rev_id))
else:
yield line