389b3a8 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

on golang help sign in

C++: make 'psc-package' bin search more robust

389b3a8Andy Arvanitis10 years ago

pcc/Makefile+6−1

@@ -15,7 +15,8 @@

15# You can also edit the generated version of this file directly.

16#

17PCC := {{path}}/pcc

18−PSC_PACKAGE := {{path}}/psc-package

18+PSC_PKG_BIN := psc-package

19+PSC_PACKAGE := {{path}}/$(PSC_PKG_BIN)

19PURESCRIPT_PKGS := .psc-package

20PURESCRIPT_PKGS := .psc-package

20PURESCRIPT_SRC := src

21PURESCRIPT_SRC := src

21OUTPUT := output

22OUTPUT := output

@@ -26,6 +27,10 @@ override PCCFLAGS += --comments

26override CXXFLAGS += -std=c++11

27override CXXFLAGS += -std=c++11

27override LDFLAGS +=

28override LDFLAGS +=

30+ifeq ("$(wildcard $(PSC_PACKAGE))","")

31+ PSC_PACKAGE := $(PSC_PKG_BIN)

32+endif

33+

29ifeq ($(GC),yes)

34ifeq ($(GC),yes)

30 override CXXFLAGS += -DUSE_GC

35 override CXXFLAGS += -DUSE_GC

31 override LDFLAGS += -lgc

36 override LDFLAGS += -lgc

pcc/psc-xcode.sh−6

@@ -39,10 +39,4 @@ for arch_ in $ARCHS ; do

39 fi

40done

42−## Look for psc-package, in case it's already in the PATH

43−#

44−if [ -x "$(command -v psc-package)" ] ; then

45− PSC_PKG="PSC_PACKAGE=$(command -v psc-package)"

46−fi

47−

48make $OBJECT_TYPE ${PSC_PKG} CXXFLAGS="$ARCH_OPTS $FLTO -isysroot $SDKROOT" LD="clang -Wl,-r -nostdlib $ARCH_OPTS" -j`sysctl -n hw.ncpu`

42make $OBJECT_TYPE ${PSC_PKG} CXXFLAGS="$ARCH_OPTS $FLTO -isysroot $SDKROOT" LD="clang -Wl,-r -nostdlib $ARCH_OPTS" -j`sysctl -n hw.ncpu`