diff --git a/Makefile b/Makefile index 25c8e359..a31624f2 100644 --- a/Makefile +++ b/Makefile @@ -131,10 +131,10 @@ chibi-scheme$(EXE): main.o libchibi-scheme$(SO) $(CC) $(XCPPFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ $< -L. $(RLDFLAGS) -lchibi-scheme chibi-scheme-static$(EXE): main.o $(SEXP_OBJS) $(EVAL_OBJS) - $(CC) $(XCFLAGS) $(STATICFLAGS) -o $@ $^ $(LDFLAGS) $(GCLDFLAGS) -lm -ldl -lutil + $(CC) $(XCFLAGS) $(STATICFLAGS) -o $@ $^ $(LDFLAGS) $(GCLDFLAGS) $(STATIC_LDFLAGS) chibi-scheme-ulimit$(EXE): main.o $(SEXP_ULIMIT_OBJS) $(EVAL_OBJS) - $(CC) $(XCFLAGS) $(STATICFLAGS) -o $@ $^ $(LDFLAGS) $(GCLDFLAGS) -lm -ldl -lutil + $(CC) $(XCFLAGS) $(STATICFLAGS) -o $@ $^ $(LDFLAGS) $(GCLDFLAGS) $(STATIC_LDFLAGS) clibs.c: $(GENSTATIC) $(CHIBI_DEPENDENCIES) $(COMPILED_LIBS:%$(SO)=%.c) $(GIT) ls-files lib | $(GREP) .sld | $(CHIBI) -q $(GENSTATIC) > $@ diff --git a/Makefile.detect b/Makefile.detect index 6cd9fed1..2a3fe4f3 100644 --- a/Makefile.detect +++ b/Makefile.detect @@ -57,6 +57,7 @@ endif LIBDL = -ldl SO_VERSIONED_SUFFIX = $(SO).$(SOVERSION) SO_MAJOR_VERSIONED_SUFFIX = $(SO).$(SOVERSION_MAJOR) +STATIC_LDFLAGS = -lm -ldl -lutil ifeq ($(PLATFORM),macosx) SO = .dylib @@ -93,6 +94,7 @@ CLINKFLAGS = -shared CPPFLAGS += -DSEXP_USE_STRING_STREAMS=0 -DSEXP_USE_GREEN_THREADS=0 -DSEXP_USE_GC_FILE_DESCRIPTORS=0 -DBUILDING_DLL LIBCHIBI_FLAGS = -Wl,--out-implib,libchibi-scheme$(SO).a STATICFLAGS = +STATIC_LDFLAGS = -lm -ldl LIBDL = -lws2_32 else ifeq ($(PLATFORM),msys) @@ -103,6 +105,7 @@ CLIBFLAGS = CLINKFLAGS = -shared CPPFLAGS += -DSEXP_USE_STRING_STREAMS=0 LIBCHIBI_FLAGS = -Wl,--out-implib,libchibi-scheme$(SO).a +STATIC_LDFLAGS = -lm -ldl else ifeq ($(PLATFORM),cygwin) SO = .dll @@ -112,6 +115,7 @@ CLIBFLAGS = CLINKFLAGS = -shared CPPFLAGS += -DSEXP_USE_STRING_STREAMS=0 LIBCHIBI_FLAGS = -Wl,--out-implib,libchibi-scheme$(SO).a +STATIC_LDFLAGS = -lm -ldl else SO = .so EXE = @@ -126,6 +130,10 @@ endif endif endif +ifeq ($(PLATFORM),emscripten) +STATIC_LDFLAGS = -lm -ldl +endif + ifeq ($(PLATFORM),unix) #RLDFLAGS=-rpath $(LIBDIR) RLDFLAGS=-Wl,-R$(LIBDIR)