aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Matt Pharr
2012-01-11 17:13:51 -08:00
parent b67446d998 fd81255db1
commit b60f8b4f70
5 changed files with 78 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -58,11 +58,7 @@ LDFLAGS=
ifeq ($(ARCH_OS),Linux)
# try to link everything statically under Linux (including libstdc++) so
# that the binaries we generate will be portable across distributions...
ifeq ($(ARCH_TYPE),x86_64)
LDFLAGS=-static -L/usr/lib/gcc/x86_64-linux-gnu/4.4
else
LDFLAGS=-L/usr/lib/gcc/i686-redhat-linux/4.6.0
endif
LDFLAGS=-static
endif
LEX=flex