Merge pull request #110 from scanlime/master

Trivial changes to fix Mac OS build
This commit is contained in:
Clifford Wolf 2015-12-15 19:54:07 +01:00
commit 9df59f0c2c
2 changed files with 2 additions and 2 deletions

View File

@ -54,7 +54,7 @@ ifeq (Darwin,$(findstring Darwin,$(shell uname)))
LDFLAGS += $(shell PKG_CONFIG_PATH=$$(brew list libffi | grep pkgconfig | xargs dirname) pkg-config --silence-errors --libs libffi) LDFLAGS += $(shell PKG_CONFIG_PATH=$$(brew list libffi | grep pkgconfig | xargs dirname) pkg-config --silence-errors --libs libffi)
# use bison installed by homebrew if available # use bison installed by homebrew if available
BISON = $(shell (brew list bison | grep -m1 "bin/bison") || echo bison) BISON = $(shell (brew list bison | grep -m1 "bin/bison") || echo bison)
SED = gsed SED = sed
else else
LDFLAGS += -rdynamic LDFLAGS += -rdynamic
LDLIBS += -lrt LDLIBS += -lrt

View File

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
for f in $( find . -name .gitignore ); do sed -re "s,^,find ${f%.gitignore} -name ',; s,$,' | xargs -r rm -f,;" $f; done | bash -v for f in $( find . -name .gitignore ); do sed -re "s,^,find ${f%.gitignore} -name ',; s,$,' | xargs rm -f,;" $f; done | bash -v