Skip to content

Commit 3c3d26b

Browse files
committed
Use escript to launch ex_doc for nix to work
1 parent 8d18ce9 commit 3c3d26b

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

erts/configure

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26902,6 +26902,9 @@ ac_config_files="$ac_config_files emulator/$host/Makefile:emulator/Makefile.in e
2690226902
ac_config_files="$ac_config_files ../make/make_emakefile:../make/make_emakefile.in"
2690326903

2690426904

26905+
ac_config_files="$ac_config_files ../make/ex_doc_wrapper:../make/ex_doc_wrapper.in"
26906+
26907+
2690526908
ac_config_files="$ac_config_files ../lib/os_mon/c_src/$host/Makefile:../lib/os_mon/c_src/Makefile.in ../lib/runtime_tools/c_src/$host/Makefile:../lib/runtime_tools/c_src/Makefile.in"
2690626909

2690726910

@@ -27615,6 +27618,7 @@ do
2761527618
"lib_src/$host/Makefile") CONFIG_FILES="$CONFIG_FILES lib_src/$host/Makefile:lib_src/Makefile.in" ;;
2761627619
"../make/$host/otp.mk") CONFIG_FILES="$CONFIG_FILES ../make/$host/otp.mk:../make/otp.mk.in" ;;
2761727620
"../make/make_emakefile") CONFIG_FILES="$CONFIG_FILES ../make/make_emakefile:../make/make_emakefile.in" ;;
27621+
"../make/ex_doc_wrapper") CONFIG_FILES="$CONFIG_FILES ../make/ex_doc_wrapper:../make/ex_doc_wrapper.in" ;;
2761827622
"../lib/os_mon/c_src/$host/Makefile") CONFIG_FILES="$CONFIG_FILES ../lib/os_mon/c_src/$host/Makefile:../lib/os_mon/c_src/Makefile.in" ;;
2761927623
"../lib/runtime_tools/c_src/$host/Makefile") CONFIG_FILES="$CONFIG_FILES ../lib/runtime_tools/c_src/$host/Makefile:../lib/runtime_tools/c_src/Makefile.in" ;;
2762027624
"../make/install_dir_data.sh") CONFIG_FILES="$CONFIG_FILES ../make/install_dir_data.sh:../make/install_dir_data.sh.in" ;;
@@ -28171,6 +28175,7 @@ printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
2817128175

2817228176
case $ac_file$ac_mode in
2817328177
"../make/make_emakefile":F) chmod +x ../make/make_emakefile ;;
28178+
"../make/ex_doc_wrapper":F) chmod +x ../make/ex_doc_wrapper ;;
2817428179
"../make/install_dir_data.sh":F) chmod +x ../make/install_dir_data.sh ;;
2817528180

2817628181
esac

erts/configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3676,6 +3676,9 @@ AC_CONFIG_FILES([
36763676
AC_CONFIG_FILES([../make/make_emakefile:../make/make_emakefile.in],
36773677
[chmod +x ../make/make_emakefile])
36783678

3679+
AC_CONFIG_FILES([../make/ex_doc_wrapper:../make/ex_doc_wrapper.in],
3680+
[chmod +x ../make/ex_doc_wrapper])
3681+
36793682
dnl
36803683
dnl The ones below should be moved to their respective lib
36813684
dnl

make/ex_doc_wrapper renamed to make/ex_doc_wrapper.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ exec 3>&1 4>&2
3232

3333
## Running the command where we redirect stderr to fd 1 and stdout to fd 3.
3434
## We then use tee on the stderr (which is now fd 1) to print that to fd 4
35-
OUTPUT="$( { "${EX_DOC}" "${ARGS[@]}"; } 2>&1 1>&3 | tee /dev/fd/4 )"
35+
OUTPUT="$( { escript@EXEEXT@ "${EX_DOC}" "${ARGS[@]}"; } 2>&1 1>&3 | tee /dev/fd/4 )"
3636

3737
## Close fd 3 and 4
3838
exec 3>&- 4>&-

0 commit comments

Comments
 (0)