File tree 4 files changed +3
-18
lines changed
4 files changed +3
-18
lines changed Original file line number Diff line number Diff line change @@ -137,7 +137,7 @@ $ hack/env make release
137
137
In order to make use of the binaries from your shell, add the build output
138
138
directory to the `$PATH`:
139
139
----
140
- $ export PATH="${PATH}:$( source hack/lib/init.sh; echo "${OS_OUTPUT_BINPATH}/$( os::util ::host_platform )/" )"
140
+ $ export PATH="${PATH}:$( source hack/lib/init.sh; echo "${OS_OUTPUT_BINPATH}/$( os::build ::host_platform )/" )"
141
141
----
142
142
143
143
See more information in https://github.com/openshift/origin/blob/master/HACKING.md#building-on-non-linux-systems[`HACKING.md`]
Original file line number Diff line number Diff line change @@ -292,7 +292,7 @@ readonly -f os::cleanup::find_cache_alterations
292
292
function os::cleanup::dump_pprof_output() {
293
293
if go tool -n pprof > /dev/null 2>&1 && [[ -s cpu.pprof ]]; then
294
294
os::log::info " [CLEANUP] \` pprof\` output logged to $( os::util::repository_relative_path " ${LOG_DIR} /pprof.out" ) "
295
- go tool pprof -text " ./_output/local/bin/$( os::util ::host_platform) /openshift" cpu.pprof > " ${LOG_DIR} /pprof.out" 2>&1
295
+ go tool pprof -text " ./_output/local/bin/$( os::build ::host_platform) /openshift" cpu.pprof > " ${LOG_DIR} /pprof.out" 2>&1
296
296
fi
297
297
}
298
298
readonly -f os::cleanup::dump_pprof_output
Original file line number Diff line number Diff line change @@ -104,7 +104,7 @@ readonly -f os::util::environment::setup_all_server_vars
104
104
function os::util::environment::update_path_var() {
105
105
local prefix
106
106
if os::util::find::system_binary ' go' > /dev/null 2>&1 ; then
107
- prefix+=" ${OS_OUTPUT_BINPATH} /$( os::util ::host_platform) :"
107
+ prefix+=" ${OS_OUTPUT_BINPATH} /$( os::build ::host_platform) :"
108
108
fi
109
109
if [[ -n " ${GOPATH:- } " ]]; then
110
110
prefix+=" ${GOPATH} /bin:"
Original file line number Diff line number Diff line change @@ -190,21 +190,6 @@ function os::util::curl_etcd() {
190
190
fi
191
191
}
192
192
193
- # os::util::host_platform determines what the host OS and architecture
194
- # are, as Golang sees it. The go tool chain does some slightly different
195
- # things when the target platform matches the host platform.
196
- #
197
- # Globals:
198
- # None
199
- # Arguments:
200
- # None
201
- # Returns:
202
- # None
203
- function os::util::host_platform() {
204
- echo " $( go env GOHOSTOS) /$( go env GOHOSTARCH) "
205
- }
206
- readonly -f os::util::host_platform
207
-
208
193
# os::util::list_go_src_files lists files we consider part of our project
209
194
# source code, useful for tools that iterate over source to provide vet-
210
195
# ting or linting, etc.
You can’t perform that action at this time.
0 commit comments