diff options
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rwxr-xr-x | configure | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 04886c8d8..0e845f375 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25,6 +25,7 @@ libdirsuffix=@libdirsuffix@ libdirreverse=@libdirreverse@ EXEEXT=@EXEEXT@ SOEXT=@SOEXT@ +PIC_FLAGS=@PIC_FLAGS@ gcc_src_dir=@gcc_src_dir@ LLVM_CONFIG=@llvm_config@ LDFLAGS=@LDFLAGS@ @@ -285,7 +286,7 @@ install.grt: libgrt.a grt.lst install.dirs vpi_thunk.o: $(GRTSRCDIR)/vpi_thunk.c $(GRTSRCDIR)/vpi_thunk.h # Do not use OPT_FLAGS (do not enable coverage) - $(CC) -c -o $@ $< -fPIC -O $(WARN_CFLAGS) + $(CC) -c -o $@ $< $(PIC_FLAGS) -O $(WARN_CFLAGS) libghdlvpi.so: vpi_thunk.o $(CC) -o $@ $< -shared -Wl,-soname,libghdlvpi.so @@ -19,11 +19,12 @@ build= build_mode= EXEEXT= SOEXT=.so +PIC_FLAGS=-fPIC show_help=no progname=$0 -subst_vars="CC GNATMAKE CFLAGS LDFLAGS build srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config backtrace_lib build_mode EXEEXT SOEXT" +subst_vars="CC GNATMAKE CFLAGS LDFLAGS build srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS" # Find srcdir srcdir=`dirname $progname` @@ -175,11 +176,12 @@ if test $backend = llvm; then esac fi -# Define default file extensions for Windows or Linux-like systems +# Define default file extensions for Windows or Linux-like systems and +# use -fPIC or not. case "$build" in - *mingw*) SOEXT=".dll"; EXEEXT=".exe";; - *darwin*) SOEXT=".dylib"; EXEEXT="";; - *) SOEXT=".so"; EXEEXT="";; + *mingw*) SOEXT=".dll"; EXEEXT=".exe"; PIC_FLAGS="";; + *darwin*) SOEXT=".dylib"; EXEEXT=""; PIC_FLAGS="";; + *) SOEXT=".so"; EXEEXT=""; PIC_FLAGS="-fPIC";; esac # Generate config.status @@ -241,6 +243,8 @@ if test $backend = mcode; then fi # Generate default_pathes.ads +# Also update dist/mcode/windows/default_pathes.ads if you change this +# template. echo "Generate default_pathes.ads" curdir=`pwd` sed -e "s%@COMPILER_GCC@%ghdl1-gcc$EXEEXT%" \ |