diff options
Diffstat (limited to 'libstdc++-v3/mkcheck.in')
| -rwxr-xr-x | libstdc++-v3/mkcheck.in | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in index 69989a3..cb1e62a 100755 --- a/libstdc++-v3/mkcheck.in +++ b/libstdc++-v3/mkcheck.in @@ -1,7 +1,5 @@ #!/usr/bin/env bash -# 2000-05-17 bkoz - # Script to do automated testing and data collection # for various test files, so that we don't have to do this by hand on # every test file. It attempts to collect some diagnostic info about @@ -61,14 +59,10 @@ fi #LIB_PATH == where to find the build library binaries. if [ $WHICH != "1" ]; then - LIB_PATH="-L$BUILD_DIR/src/.libs" -# BSD seems to want this -# LIB_PATH="-L$BUILD_DIR/src/.libs -R$BUILD_DIR/src/.libs" + LIB_PATH="$BUILD_DIR/src/.libs" CXX="../../gcc/g++ -B../../gcc/" elif [ $WHICH -eq 1 ]; then - LIB_PATH="-L$PREFIX_DIR/lib" -# BSD seems to want this -# LIB_PATH="-L$PREFIX_DIR/lib -R$PREFIX_DIR/lib" + LIB_PATH="$PREFIX_DIR/lib" CXX="$PREFIX_DIR/bin/g++" fi @@ -77,10 +71,10 @@ fi #CXX_FLAG="-g -O2 -DDEBUG_ASSERT " CXX_FLAG="-g -DDEBUG_ASSERT " -# a specific flag to force the use of shared libraries, if any +# a specific flag(s) to force the use of shared libraries, if any SH_FLAG="" -# a specific flag to force the use of static libraries, if any +# a specific flag(s) to force the use of static libraries, if any ST_FLAG="-static" # Set up the testing directory, which should be in a directory called @@ -183,8 +177,8 @@ test_file() # eventually have to calculate time_t anyhow. Or 3) just grab two # time_t's (no more overhead than grabbing two date(1)'s). COMP_TIME_START=$($TEST_DIR/printnow) - $CXX $CXX_FLAG $S_FLAG $INC_PATH $LIB_PATH $FILENAME \ - -o $EXENAME 2>> $LOG_FILE + $CXX $CXX_FLAG $S_FLAG $INC_PATH -L$LIB_PATH -Wl,--rpath -Wl,$LIB_PATH \ + $FILENAME -o $EXENAME 2>> $LOG_FILE COMP_TIME_END=$($TEST_DIR/printnow) if [ $COMP_TIME_START -lt $COMP_TIME_END ]; then @@ -293,8 +287,8 @@ test_file() #fi else # the file did not compile. Write out compilation info to the log file. - echo "$CXX $CXX_FLAG $ST_FLAG $INC_PATH $LIB_PATH $CNAME -o $EXENAME" \ - 2>> $LOG_FILE + echo "$CXX $CXX_FLAG $S_FLAG $INC_PATH -L$LIB_PATH -Wl,--rpath -Wl,$LIB_PATH \ + $FILENAME -o $EXENAME" 2>> $LOG_FILE RESULT="-" TEXT="0" |