diff --git a/Makefile b/Makefile
index bd587a7400eb9e5ed5e8676a8631ce626be24367..53958d5ac02e93b49e5a1af449daad0e4dede01a 100644
--- a/Makefile
+++ b/Makefile
@@ -63,14 +63,16 @@ POSTINSTALL      = install_name_tool
 FORCE_ARCH      ?=
 ARCHFLAGS       ?=
 LIPO            ?= lipo
-XCFLAGS         ?= -Os -Wall -Wno-deprecated-declarations
+DEBUG           ?=
+OPT             ?= -Os
+XCFLAGS         ?= $(DEBUG) $(OPT) -Wall -Wno-deprecated-declarations
 ALLCFLAGS       := $(ARCHFLAGS) $(XCFLAGS) $(CFLAGS)
 DLIBCFLAGS      ?= -fPIC
 SLIBCFLAGS      ?=
-XCXXFLAGS       ?= -Os -Wall
+XCXXFLAGS       ?= $(DEBUG) $(OPT) -Wall
 ALLCXXFLAGS     := $(ARCHFLAGS) $(XCXXFLAGS) $(CXXFLAGS)
-LD              ?= ld
-LDFLAGS         ?=
+LD              ?= /usr/bin/ld
+LDFLAGS         ?= $(DEBUG)
 ALLLDFLAGS      := $(ARCHFLAGS) $(LDFLAGS)
 TEST_ARGS       ?=