Changeset View
Changeset View
Standalone View
Standalone View
cad/klayout/files/patch-build.sh
| Show All 22 Lines | @@ -374,7 +377,7 @@ if [ $HAVE_64BIT_COORD != 0 ]; then | ||||
| echo " 64 bit coordinates enabled" | echo " 64 bit coordinates enabled" | ||||
| fi | fi | ||||
| -gcc_path=`type gcc 2>/dev/null` | -gcc_path=`type gcc 2>/dev/null` | ||||
| +gcc_path=`type $CC 2>/dev/null` | +gcc_path=`type $CC 2>/dev/null` | ||||
| if [ "$gcc_path" = "" ]; then | if [ "$gcc_path" = "" ]; then | ||||
| echo "*** ERROR: unable to locate gcc in path" | echo "*** ERROR: unable to locate gcc in path" | ||||
| exit 1 | exit 1 | ||||
| @@ -398,11 +401,11 @@ mac-*) | |||||
| ;; | |||||
| esac | |||||
| -if [ ! -r $QTBIN/moc ]; then | |||||
| +if [ ! -r $QTBIN/moc-qt4 ]; then | |||||
| echo "*** ERROR: unable to locate Qt MOC in $QTBIN" | |||||
| exit 1 | |||||
| fi | |||||
| -if [ ! -r $QTBIN/uic ]; then | |||||
| +if [ ! -r $QTBIN/uic-qt4 ]; then | |||||
| echo "*** ERROR: unable to locate Qt UIC in $QTBIN" | |||||
| exit 1 | |||||
| fi | |||||
| @@ -463,11 +466,7 @@ else | @@ -463,11 +466,7 @@ else | ||||
| cd $CURR_DIR | cd $CURR_DIR | ||||
| fi | fi | ||||
| -if ( gmake -v >/dev/null 2>/dev/null ); then | -if ( gmake -v >/dev/null 2>/dev/null ); then | ||||
| - MAKE_PRG=gmake | - MAKE_PRG=gmake | ||||
| -else | -else | ||||
| - MAKE_PRG=make | - MAKE_PRG=make | ||||
| Show All 33 Lines | |||||