Browse code

Merge commit '3601af91c6933cf53093c404bde33c16e0ddd441'

Nat! authored on 13/06/2017 11:49:30
Showing 2 changed files
... ...
@@ -4,16 +4,26 @@ set -e
4 4
 
5 5
 TESTDIR="`pwd -P`"
6 6
 
7
-mulle-bootstrap build -c Debug -k "$@"
7
+mulle-bootstrap build -c Debug -k
8 8
 
9
-if [ -d ../build ]
9
+cd ..
10
+
11
+
12
+if [ -f .CC ]
13
+then
14
+   OPTIONS="-DCMAKE_C_COMPILER=`cat .CC` -DCMAKE_CXX_COMPILER=`cat .CXX`"
15
+fi
16
+
17
+if [ -d build ]
10 18
 then
11
-   rm -rf ../build
19
+   rm -rf build
12 20
 fi
21
+mkdir build
22
+
13 23
 
14
-mkdir ../build
15
-cd ../build
16
-   cmake -DCMAKE_OSX_SYSROOT=macosx \
17
-         -DCMAKE_INSTALL_PREFIX="${TESTDIR}" \
18
-         -DCMAKE_BUILD_TYPE=Debug ..
19
-   make -j 4 install
24
+cd build
25
+   eval cmake -DCMAKE_OSX_SYSROOT=macosx \
26
+              -DCMAKE_INSTALL_PREFIX="'${TESTDIR}'" \
27
+              ${OPTIONS} \
28
+              -DCMAKE_BUILD_TYPE=Debug ..
29
+   make -j 4 "$@" install
... ...
@@ -418,7 +418,7 @@ main()
418 418
    #
419 419
    # find executable
420 420
    #
421
-   exe=`ls -1 ../bin/mulle-scion 2> /dev/null | tail -1`
421
+   exe=`ls -1 ./bin/mulle-scion 2> /dev/null | tail -1`
422 422
    if [ ! -x "${exe}" ]
423 423
    then
424 424
       exe=`ls -1 ../?uild/Products/*/mulle-scion 2> /dev/null | tail -1`
... ...
@@ -455,11 +455,13 @@ main()
455 455
          Darwin)
456 456
             DYLD_FALLBACK_FRAMEWORK_PATH="${DEPENDENCIES}/Frameworks"
457 457
             export DYLD_FALLBACK_FRAMEWORK_PATH
458
+            echo "DYLD_FALLBACK_FRAMEWORK_PATH='${DEPENDENCIES}/Frameworks'" >&2
458 459
             ;;
459 460
 
460 461
          *)
461 462
             LD_LIBRARY_PATH="${DEPENDENCIES}/lib:${LD_LIBRARY_PATH}"
462 463
             export LD_LIBRARY_PATH
464
+            echo "LD_LIBRARY_PATH='${DEPENDENCIES}/lib:${LD_LIBRARY_PATH}'" >&2
463 465
             ;;
464 466
       esac
465 467
    fi