git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
C++: make 'psc-package' bin search more robust
commit389b3a8ab12814aaff7a299fa4add02a3309b92a authorAndy Arvanitis <andyarvanitis@gmail.com> dateSat 19 Nov 2016, 15:52 (10 years ago) parentf6c70bc
2 files changed+6−7
compare with golang
unifiedsplit
pcc/Makefile+6−1 pcc/psc-xcode.sh−6
pcc/Makefile+6−1
@@ -15,7 +15,8 @@
1515# You can also edit the generated version of this file directly.
1616#
1717PCC := {{path}}/pcc
18−PSC_PACKAGE := {{path}}/psc-package
18+PSC_PKG_BIN := psc-package
19+PSC_PACKAGE := {{path}}/$(PSC_PKG_BIN)
1920PURESCRIPT_PKGS := .psc-package
2021PURESCRIPT_SRC := src
2122OUTPUT := output
@@ -26,6 +27,10 @@ override PCCFLAGS += --comments
2627override CXXFLAGS += -std=c++11
2728override LDFLAGS +=
2829
30+ifeq ("$(wildcard $(PSC_PACKAGE))","")
31+ PSC_PACKAGE := $(PSC_PKG_BIN)
32+endif
33+
2934ifeq ($(GC),yes)
3035 override CXXFLAGS += -DUSE_GC
3136 override LDFLAGS += -lgc
pcc/psc-xcode.sh−6
@@ -39,10 +39,4 @@ for arch_ in $ARCHS ; do
3939 fi
4040done
4141
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−
4842make $OBJECT_TYPE ${PSC_PKG} CXXFLAGS="$ARCH_OPTS $FLTO -isysroot $SDKROOT" LD="clang -Wl,-r -nostdlib $ARCH_OPTS" -j`sysctl -n hw.ncpu`