Ticket #37878: library_path_test_2.diff

config.tests/mac/library_path/library_path.test

@@ -5 +5 @@
 VERBOSE=$2
 WORKDIR=$3
 
+done=no
 cd $3
 
 # (1) make the library
 if "$COMPILER" -dynamiclib -o library_path_lib.dylib library_path_lib.c; then
     # (2) do the test, without LIBRARY_PATH; should fail
-    if "$COMPILER" -nostdlib -nostdinc -I. -o library_path_test library_path_test.c -lrary_path_lib; then
-        true
+    unset LIBRARY_PATH
+    if "$COMPILER" -nostdinc -I. -o library_path_test library_path_test.c -lrary_path_lib; then
+        echo "Compile seems to work even with LIBRARY_PATH not set; assuming LIBRARY_PATH works"
+        done=yes
     else
-        # (3) do the test, with LIBRARY_PATH set; should pass
+        # (3) do the test, with LIBRARY_PATH now set; should pass
         export LIBRARY_PATH=.
-        if "$COMPILER" -nostdlib -nostdinc -I. -o library_path_test library_path_test.c -lrary_path_lib; then
+        if "$COMPILER" -nostdinc -I. -o library_path_test library_path_test.c -lrary_path_lib; then
             LIBRARY_PATH_SUPPORT=yes
         fi
     fi
     rm -f library_path_test.o library_path_test
 else
     echo "Unable to compile library; assuming LIBRARY_PATH works"
-    exit 1
+    done=yes
 fi
 rm -f library_path_lib.dylib library_path_lib.o
 
+# if done above, assume it works and exit
+[ "$done" = "yes" ] && exit 1
+
 if [ "$LIBRARY_PATH_SUPPORT" != "yes" ]; then
     [ "$VERBOSE" = "yes" ] && echo "LIBRARY_PATH support not detected"
     exit 0