From da54dfbbf4e9365fd903c5403ca38b544d289ded Mon Sep 17 00:00:00 2001 From: peterz Date: Tue, 26 Jan 2021 10:40:08 +0300 Subject: [PATCH] Fixed #include and CFLAGS for libf2c --- com.oracle.truffle.r.native/f2c/libf2c-patch/fpu_control.h | 2 +- com.oracle.truffle.r.native/f2c/libf2c-patch/makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/com.oracle.truffle.r.native/f2c/libf2c-patch/fpu_control.h b/com.oracle.truffle.r.native/f2c/libf2c-patch/fpu_control.h index 4f17984d00..bc8b4ed9c8 100644 --- a/com.oracle.truffle.r.native/f2c/libf2c-patch/fpu_control.h +++ b/com.oracle.truffle.r.native/f2c/libf2c-patch/fpu_control.h @@ -23,5 +23,5 @@ /* Used to avoid compiler error on musl due to missing header file */ #if !defined(__linux__) || defined(__GLIBC__) -#include_next "fpu_control.h" +#include #endif diff --git a/com.oracle.truffle.r.native/f2c/libf2c-patch/makefile b/com.oracle.truffle.r.native/f2c/libf2c-patch/makefile index 6f62a444b6..cc1844a723 100644 --- a/com.oracle.truffle.r.native/f2c/libf2c-patch/makefile +++ b/com.oracle.truffle.r.native/f2c/libf2c-patch/makefile @@ -96,10 +96,10 @@ libf2c.so: $(OFILES) ### If your system lacks ranlib, you don't need it; see README. f77vers.o: f77vers.c - $(CC) -c f77vers.c + $(CC) -c $(CFLAGS) f77vers.c i77vers.o: i77vers.c - $(CC) -c i77vers.c + $(CC) -c $(CFLAGS) i77vers.c # To get an "f2c.h" for use with "f2c -C++", first "make hadd" hadd: f2c.h0 f2ch.add