diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-02-16 23:26:53 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-02-16 23:26:53 +0000 |
| commit | a2231a6a1d24ee10a43473829ae72762ca016ab5 (patch) | |
| tree | 2aa5be10623cd6e38a35bce402d0aea6ca5b48b1 /common | |
| parent | 589901bc57340fddbd9def779ccbb228e4a693b8 (diff) | |
| download | tigervnc-a2231a6a1d24ee10a43473829ae72762ca016ab5.tar.gz tigervnc-a2231a6a1d24ee10a43473829ae72762ca016ab5.zip | |
Fix build on Sun Studio
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3987 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common')
| -rw-r--r-- | common/jpeg/simd/Makefile.am | 3 | ||||
| -rwxr-xr-x | common/jpeg/simd/nasm_lt.sh | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/common/jpeg/simd/Makefile.am b/common/jpeg/simd/Makefile.am index e57c4772..a114c371 100644 --- a/common/jpeg/simd/Makefile.am +++ b/common/jpeg/simd/Makefile.am @@ -55,5 +55,4 @@ AM_CPPFLAGS = -I$(top_srcdir) $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(NASM) $(NAFLAGS) -I$(srcdir) $< -o $@ jsimdcfg.inc: $(srcdir)/jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h - $(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) ^[\;%] | sed 's%_cpp_protection_%%' > $@ - + $(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) "^[\;%]|^\ %" | sed 's%_cpp_protection_%%' | sed 's@% define@%define@g' > $@ diff --git a/common/jpeg/simd/nasm_lt.sh b/common/jpeg/simd/nasm_lt.sh index b112862a..7ba52534 100755 --- a/common/jpeg/simd/nasm_lt.sh +++ b/common/jpeg/simd/nasm_lt.sh @@ -5,7 +5,7 @@ o_opt=no pic=no while [ $# -gt 0 ]; do case "$1" in - -DPIC|-fPIC|-fpic) + -DPIC|-fPIC|-fpic|-Kpic|-KPIC) if [ "$pic" != "yes" ] ; then command="$command -DPIC" pic=yes |