From 0d8f30fcddf904670afded0e3c165586fe0789d6 Mon Sep 17 00:00:00 2001
From: Boxiang Sun <daetalusun@gmail.com>
Date: Tue, 13 Sep 2016 07:25:58 +0800
Subject: [PATCH] system should provide usable gcc

---
 Makefile | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 7d4ea49b9..d3dea3cf6 100644
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,6 @@ CPYTHON := python
 ENABLE_VALGRIND := 0
 
 GDB := gdb
-# If you followed the old install instructions:
-# GCC_DIR := $(DEPS_DIR)/gcc-4.8.2-install
-GCC_DIR := /usr
 GTEST_DIR := $(DEPS_DIR)/gtest-1.7.0
 
 USE_DEBUG_LIBUNWIND := 0
@@ -76,8 +73,8 @@ TOOLS_DIR := ./tools
 TEST_DIR := $(abspath ./test)
 TESTS_DIR := $(abspath ./test/tests)
 
-GPP := $(GCC_DIR)/bin/g++
-GCC := $(GCC_DIR)/bin/gcc
+GPP := g++
+GCC := gcc
 
 ifeq ($(V),1)
 	VERBOSE := 1
@@ -155,11 +152,6 @@ COMMON_LDFLAGS += `pkg-config tinfo 2>/dev/null && pkg-config tinfo --libs || ec
 # TODO should probably do the linking before MCJIT
 COMMON_LDFLAGS += -Wl,-E
 
-# We get multiple shared libraries (libstdc++, libgcc_s) from the gcc installation:
-ifneq ($(GCC_DIR),/usr)
-	COMMON_LDFLAGS += -Wl,-rpath $(GCC_DIR)/lib64
-endif
-
 ifneq ($(USE_DEBUG_LIBUNWIND),0)
 	COMMON_LDFLAGS += -L$(DEPS_DIR)/libunwind-trunk-debug-install/lib