From 2663945d4cc5abe7e8277f809a15bcd2f8564c7a Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Thu, 23 May 2019 14:16:27 -0400
Subject: [PATCH] Do not use fPIC when cyclone compiles programs

---
 Makefile.config | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.config b/Makefile.config
index 7c016f2b..bb33cda3 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -24,10 +24,14 @@ endif
 # Compiler options
 CFLAGS       ?= $(CYC_PROFILING) $(CYC_GCC_OPT_FLAGS) -fPIC -Wall -Iinclude
 BASE_CFLAGS  ?= $(CYC_PROFILING) $(CYC_GCC_OPT_FLAGS) -fPIC -Wall -I$(PREFIX)/include
+# Used by Cyclone to compile programs, no need for PIC there
+BASE_PROG_CFLAGS  ?= $(CYC_PROFILING) $(CYC_GCC_OPT_FLAGS) -Wall -I$(PREFIX)/include
 ifeq ($(OS),Darwin)
 COMP_CFLAGS  ?= $(BASE_CFLAGS)
+COMP_PROG_CFLAGS  ?= $(BASE_PROG_CFLAGS)
 else
 COMP_CFLAGS  ?= $(BASE_CFLAGS) -L$(PREFIX)/lib
+COMP_PROG_CFLAGS  ?= $(BASE_PROG_CFLAGS) -L$(PREFIX)/lib
 endif
 
 # Use these lines instead for debugging or profiling
@@ -58,7 +62,7 @@ endif
 
 
 # Commands "baked into" cyclone for invoking the C compiler
-CC_PROG ?= "$(CC) ~src-file~ $(COMP_CFLAGS) -c -o ~exec-file~.o"
+CC_PROG ?= "$(CC) ~src-file~ $(COMP_PROG_CFLAGS) -c -o ~exec-file~.o"
 CC_EXEC ?= "$(CC) ~exec-file~.o ~obj-files~ $(LIBS) $(COMP_CFLAGS) -o ~exec-file~"
 CC_LIB  ?= "$(CC) ~src-file~ $(COMP_CFLAGS) -c -o ~exec-file~.o"
 CC_SO   ?= "$(CC) -shared $(LDFLAGS) -o ~exec-file~.so ~exec-file~.o"