From 98149255feea67f3d01538007fe4f2b53c45ffb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= <t.poechtrager@gmail.com>
Date: Mon, 4 Nov 2019 20:32:05 +0100
Subject: [PATCH] wrapper: * Add missing symlink * Don't build with -g if
 OCDEBUG=1 isn't given

---
 wrapper/Makefile         | 6 +++++-
 wrapper/build_wrapper.sh | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/wrapper/Makefile b/wrapper/Makefile
index 076e2e9..7d41d46 100644
--- a/wrapper/Makefile
+++ b/wrapper/Makefile
@@ -11,12 +11,16 @@ ADDITIONAL_CXXFLAGS ?=
 
 override CXXFLAGS=-std=c++1y -Wall -Wextra -pedantic
 override CXXFLAGS+=-Wno-missing-field-initializers
-override CXXFLAGS+=-I. -O$(OPTIMIZE) -g
+override CXXFLAGS+=-I. -O$(OPTIMIZE)
 
 ifeq ($(LTO), 1)
   override CXXFLAGS+=-flto
 endif
 
+ifeq ($(OCDEBUG), 1)
+  override CXXFLAGS+=-g
+endif
+
 override CXXFLAGS+=-DOSXCROSS_VERSION="\"$(VERSION)\""
 override CXXFLAGS+=-DOSXCROSS_TARGET="\"$(TARGET)\""
 override CXXFLAGS+=-DOSXCROSS_OSX_VERSION_MIN="\"$(OSX_VERSION_MIN)\""
diff --git a/wrapper/build_wrapper.sh b/wrapper/build_wrapper.sh
index abd0dda..a781e48 100755
--- a/wrapper/build_wrapper.sh
+++ b/wrapper/build_wrapper.sh
@@ -177,6 +177,8 @@ if [ "$PLATFORM" != "Darwin" ]; then
     # LLVM dsymutil version. In this case don't wrap it.
     # Just create target symlinks.
 
+    verbose_cmd create_symlink $(which dsymutil) x86_64-apple-$TARGET-dsymutil
+
     if [ $I386_SUPPORTED -eq 1 ]; then
       verbose_cmd create_symlink $(which dsymutil) i386-apple-$TARGET-dsymutil
     fi