From 5007ef2d20536d0294fc4fbed51a2244c017d3c0 Mon Sep 17 00:00:00 2001 From: Abdulaziz Ghuloum Date: Sun, 9 Sep 2007 20:58:47 -0400 Subject: [PATCH] * Fixed linux build options in makefile. --- bin/Makefile | 8 ++++---- bin/ikarus | Bin 68100 -> 68100 bytes bin/ikarus-fasl.c | 1 - bin/ikarus-main.c | 4 +++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index aa0ccd0..71702b3 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -1,10 +1,10 @@ CFLAGS = -I/opt/local/include -Wall -DNDEBUG -O3 #CFLAGS = -I/opt/local/include -Wall -g -LDFLAGS = -L/opt/local/lib -g -ldl -lgmp -lz -lm +LDFLAGS = -L/opt/local/lib -g -ldl -lgmp -lm CC = gcc -ifeq ($(shell /usr/bin/uname), "Linux") +ifeq ("$(shell uname)", "Linux") LDFLAGS += -rdynamic # dlsym(local_symbol) won't work otherwise endif @@ -57,7 +57,7 @@ ikarus.h: ikarus-data.h touch ikarus.h clean: - rm -f $(obj) + rm -f $(objects) realclean: - rm -f $(obj) ikarus + rm -f $(objects) ikarus diff --git a/bin/ikarus b/bin/ikarus index 3ef4d7fe7e438f54e667c4cde4bac6e141e6e79c..d5ead9ea9fa567f31079440c7b8834c91a8046c8 100755 GIT binary patch delta 45 xcmZpf!qPH@MfBXSxBu7~7#Ns=m&3;O^7 delta 93 zcmZpf!qPH@MfBXSxBu7~7#Ns=mL%ozrAY*efOD5YUZkGQ5$E+5u diff --git a/bin/ikarus-fasl.c b/bin/ikarus-fasl.c index e39d84b..abc38f3 100644 --- a/bin/ikarus-fasl.c +++ b/bin/ikarus-fasl.c @@ -13,7 +13,6 @@ #include #include -#include #ifndef RTLD_DEFAULT #define RTLD_DEFAULT 0 diff --git a/bin/ikarus-main.c b/bin/ikarus-main.c index 773ec83..f82d3de 100644 --- a/bin/ikarus-main.c +++ b/bin/ikarus-main.c @@ -170,6 +170,8 @@ int main(int argc, char** argv){ } #if 0 +Notice how the bsd manpages have incorrect type for the handler. + #include struct sigaction { @@ -189,7 +191,7 @@ int main(int argc, char** argv){ struct sigaction * restrict oact); #endif -void handler(int signo, struct __siginfo* info, void* uap){ +void handler(int signo, siginfo_t* info, void* uap){ the_pcb->engine_counter = -1; the_pcb->interrupted = 1; }