Commit c2570659 authored by Josh Coalson's avatar Josh Coalson
Browse files

rename strip_fPIC.sh to strip_non_asm_libtool_args.sh, as it takes on new...

rename strip_fPIC.sh to strip_non_asm_libtool_args.sh, as it takes on new duties stripping other arguments for other assemblers
parent cce2f25a
......@@ -45,6 +45,6 @@ EXTRA_DIST = \
config.rpath \
depcomp \
ltmain.sh \
strip_fPIC.sh
strip_non_asm_libtool_args.sh
AUTOMAKE_OPTIONS = foreign
......@@ -45,6 +45,7 @@ endif
if FLaC__CPU_PPC
ARCH_SUBDIRS = ppc
libFLAC_la_LIBADD = ppc/libFLAC-asm.la
LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
endif
endif
......@@ -60,7 +61,7 @@ EXTRA_DIST = \
libFLAC.m4
# see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
libFLAC_la_LDFLAGS = -version-info 5:2:1 -lm
libFLAC_la_LDFLAGS = -version-info 5:2:1 -lm $(LOCAL_EXTRA_LDFLAGS)
libFLAC_la_SOURCES = \
bitbuffer.c \
bitmath.c \
......
......@@ -30,10 +30,10 @@
SUFFIXES = .nasm .lo
STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
.nasm.lo:
$(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
$(LIBTOOL) --mode=compile $(STRIP_NON_ASM) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
noinst_LTLIBRARIES = libFLAC-asm.la
libFLAC_asm_la_SOURCES = \
......
#!/bin/sh
#
# libtool assumes that the compiler can handle the -fPIC flag
# This isn't always true (for example, nasm can't handle it)
# libtool assumes that the compiler can handle the -fPIC flag.
# This isn't always true (for example, nasm can't handle it).
# Also, on some versions of OS X it tries to pass -fno-common
# to 'as' which causes problems.
command=""
while [ $1 ]; do
if [ "$1" != "-fPIC" ]; then
if [ "$1" != "-DPIC" ]; then
command="$command $1"
if [ "$1" != "-fno-common" ]; then
command="$command $1"
fi
fi
fi
shift
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment