aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug49733
-rw-r--r--changes/osx_deadstrip5
-rw-r--r--configure.in5
-rw-r--r--src/common/compat.c2
4 files changed, 12 insertions, 3 deletions
diff --git a/changes/bug4973 b/changes/bug4973
new file mode 100644
index 0000000000..dd3ad690b7
--- /dev/null
+++ b/changes/bug4973
@@ -0,0 +1,3 @@
+ o Minor bugfixes:
+ - Calculate absolute paths correctly on Windows. Fixes bug 4973;
+ bugfix on 0.2.3.11-alpha.
diff --git a/changes/osx_deadstrip b/changes/osx_deadstrip
new file mode 100644
index 0000000000..f16eca4685
--- /dev/null
+++ b/changes/osx_deadstrip
@@ -0,0 +1,5 @@
+ o Minor features:
+ - Use the dead_strip option when building Tor on OS X. This reduces binary
+ size by almost 19% when linking openssl and libevent statically, which
+ we do for TBB.
+
diff --git a/configure.in b/configure.in
index e4bb12d74c..ddb682379d 100644
--- a/configure.in
+++ b/configure.in
@@ -1160,12 +1160,13 @@ else
fi
# OS X Lion started deprecating the system openssl. Let's just disable
-# all deprecation warnings on OS X.
+# all deprecation warnings on OS X. Also, to potentially make the binary
+# a little smaller, let's enable dead_strip.
case "$host_os" in
darwin*)
CFLAGS="$CFLAGS -Wno-deprecated-declarations"
- ;;
+ LDFLAGS="$LDFLAGS -dead_strip" ;;
esac
# Add some more warnings which we use in development but not in the
diff --git a/src/common/compat.c b/src/common/compat.c
index 4af670a18d..cd112035c6 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1628,7 +1628,7 @@ get_parent_directory(char *fname)
char *
make_path_absolute(char *fname)
{
-#ifdef WINDOWS
+#ifdef MS_WINDOWS
char *absfname_malloced = _fullpath(NULL, fname, 1);
/* We don't want to assume that tor_free can free a string allocated