Fix build so that it works with clang.

make USE_CLANG=1 USE_GCC=0

Make.inc

@@ -25,7 +25,7 @@ FC = gfortran
 CFLAGS = -pipe -std=gnu99 -fPIC
 CXXFLAGS = -pipe -fPIC -fno-rtti
 DEBUGFLAGS = -ggdb3 -DDEBUG
-SHIPFLAGS = -O3 -DNDEBUG
+SHIPFLAGS = -O3 -DNDEBUG -falign-functions
 endif
 
 ifeq ($(USECLANG),1)
@@ -34,7 +34,7 @@ CXX = clang++
 CFLAGS = -fPIC -fexceptions -pipe
 CXXFLAGS = -fPIC -fno-rtti -fexceptions -pipe
 DEBUGFLAGS = -g -DDEBUG
-SHIPFLAGS = -O4 -DNDEBUG
+SHIPFLAGS = -O3 -DNDEBUG
 endif
 
 # OS specific stuff

src/Makefile

@@ -10,7 +10,7 @@ FLISPDIR = ./flisp
 SUPPORT = $(SUPPORTDIR)/libsupport.a
 FLISP = $(FLISPDIR)/libflisp.a
 
-FLAGS = -falign-functions -Wall -Wno-strict-aliasing -fno-omit-frame-pointer \
+FLAGS = -Wall -Wno-strict-aliasing -fno-omit-frame-pointer \
 	-I$(FLISPDIR) -I$(SUPPORTDIR) -fvisibility=hidden -fno-common \
 	-I$(shell $(LLVMROOT)/bin/llvm-config --includedir)
 DEBUGFLAGS += $(FLAGS)

ui/Makefile

@@ -9,11 +9,15 @@ else
 READLINE = -lncurses $(EXTROOT)/lib/libreadline.a
 endif
 
-FLAGS = -falign-functions -Wall -Wno-strict-aliasing \
-	-fno-omit-frame-pointer \
+FLAGS = -Wall -Wno-strict-aliasing -fno-omit-frame-pointer \
 	-I$(JULIAHOME)/src -I$(LLTDIR) -I$(EXTROOT)/include $(CFLAGS)
-DEBUGFLAGS += $(FLAGS) -static-libgcc -static-libstdc++
-SHIPFLAGS += $(FLAGS) -static-libgcc -static-libstdc++
+DEBUGFLAGS = $(FLAGS)
+SHIPFLAGS = $(FLAGS)
+
+ifeq ($(USEGCC),1)
+DEBUGFLAGS += -static-libgcc -static-libstdc++
+SHIPFLAGS += -static-libgcc -static-libstdc++
+endif
 
 LIBJULIA_RELEASE = $(JULIAHOME)/src/libjulia-release.a
 LIBJULIA_DEBUG = $(JULIAHOME)/src/libjulia-debug.a