Skip to content

Commit 0d8f30f

Browse files
committed
system should provide usable gcc
1 parent 26048a7 commit 0d8f30f

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

Makefile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ CPYTHON := python
2424
ENABLE_VALGRIND := 0
2525

2626
GDB := gdb
27-
# If you followed the old install instructions:
28-
# GCC_DIR := $(DEPS_DIR)/gcc-4.8.2-install
29-
GCC_DIR := /usr
3027
GTEST_DIR := $(DEPS_DIR)/gtest-1.7.0
3128

3229
USE_DEBUG_LIBUNWIND := 0
@@ -76,8 +73,8 @@ TOOLS_DIR := ./tools
7673
TEST_DIR := $(abspath ./test)
7774
TESTS_DIR := $(abspath ./test/tests)
7875

79-
GPP := $(GCC_DIR)/bin/g++
80-
GCC := $(GCC_DIR)/bin/gcc
76+
GPP := g++
77+
GCC := gcc
8178

8279
ifeq ($(V),1)
8380
VERBOSE := 1
@@ -155,11 +152,6 @@ COMMON_LDFLAGS += `pkg-config tinfo 2>/dev/null && pkg-config tinfo --libs || ec
155152
# TODO should probably do the linking before MCJIT
156153
COMMON_LDFLAGS += -Wl,-E
157154

158-
# We get multiple shared libraries (libstdc++, libgcc_s) from the gcc installation:
159-
ifneq ($(GCC_DIR),/usr)
160-
COMMON_LDFLAGS += -Wl,-rpath $(GCC_DIR)/lib64
161-
endif
162-
163155
ifneq ($(USE_DEBUG_LIBUNWIND),0)
164156
COMMON_LDFLAGS += -L$(DEPS_DIR)/libunwind-trunk-debug-install/lib
165157

0 commit comments

Comments
 (0)