Skip to content

Commit

Permalink
system should provide usable gcc
Browse files Browse the repository at this point in the history
  • Loading branch information
Daetalus committed Sep 12, 2016
1 parent 26048a7 commit 0d8f30f
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 0d8f30f

Please sign in to comment.