From fde7b5fb7adbfd2c49e503259e3c928f4de3f9a9 Mon Sep 17 00:00:00 2001 From: Nick Markwell Date: Sun, 17 Jun 2012 10:08:03 -0400 Subject: [PATCH] Add `LIBGC_FORCE_COMPILE=true` flag. This forces it to compile libgc. Useful in cases where the system libgc does not work as it should. (I ran into this problem on ArchLinux. Not sure what happened.) --- Makefile | 2 +- libs/Makefile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6e6e8556..ec9a6b12 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ prepare_bootstrap: @echo "Done!" boehmgc: - cd libs && $(MAKE) + cd libs && $(MAKE) LIBGC_FORCE_COMPILE=${LIBGC_FORCE_COMPILE} # For c-source based rock releases, 'make bootstrap' will compile a version # of rock from the C sources in build/, then use that version to re-compile itself diff --git a/libs/Makefile b/libs/Makefile index 9f64a08e..aa2da665 100644 --- a/libs/Makefile +++ b/libs/Makefile @@ -54,6 +54,10 @@ GC_PREFIX?=$(shell pkg-config --variable=libdir bdw-gc) LIBGC_PRESENT=$(wildcard ${GC_PREFIX}/libgc.a) LIBGC_SUPPORTS_THREADS=$(shell nm $(wildcard ${GC_PREFIX}/libgc.a) | grep GC_pthread_create) +ifneq (${LIBGC_FORCE_COMPILE},) + LIBGC_PRESENT= +endif + all: mkdir -p ${GC_PATH} ifneq (${LIBGC_PRESENT},)